<?xml version="1.0" encoding="UTF-8"?>
<rss version="2.0"
	xmlns:content="http://purl.org/rss/1.0/modules/content/"
	xmlns:wfw="http://wellformedweb.org/CommentAPI/"
	xmlns:dc="http://purl.org/dc/elements/1.1/"
	xmlns:atom="http://www.w3.org/2005/Atom"
	xmlns:sy="http://purl.org/rss/1.0/modules/syndication/"
	xmlns:slash="http://purl.org/rss/1.0/modules/slash/"
	>

<channel>
	<title>Stefan Sobek Blog &#187; merge</title>
	<atom:link href="http://www.sobek.info/blog/tag/merge/feed/" rel="self" type="application/rss+xml" />
	<link>http://www.sobek.info/blog</link>
	<description>Writing about IT, Software Engineering, sports and other stuff</description>
	<lastBuildDate>Mon, 24 Jan 2011 12:50:08 +0000</lastBuildDate>
	<generator>http://wordpress.org/?v=2.9</generator>
	<language>en</language>
	<sy:updatePeriod>hourly</sy:updatePeriod>
	<sy:updateFrequency>1</sy:updateFrequency>
			<item>
		<title>Revert changes in svn</title>
		<link>http://www.sobek.info/blog/2010/03/25/revert-changes-in-svn/</link>
		<comments>http://www.sobek.info/blog/2010/03/25/revert-changes-in-svn/#comments</comments>
		<pubDate>Thu, 25 Mar 2010 10:46:06 +0000</pubDate>
		<dc:creator>admin</dc:creator>
				<category><![CDATA[Bash]]></category>
		<category><![CDATA[English]]></category>
		<category><![CDATA[Linux]]></category>
		<category><![CDATA[Subversion]]></category>
		<category><![CDATA[merge]]></category>
		<category><![CDATA[reverse change]]></category>
		<category><![CDATA[svn]]></category>
		<category><![CDATA[undo merge]]></category>

		<guid isPermaLink="false">http://www.sobek.info/blog/?p=236</guid>
		<description><![CDATA[Sometimes you have to revert changes in svn from lets say a commit you made some days ago. Since then more commits where done and this can be a hard job to undo your changes. So how to undo the changes e.g. from your change in revision 120 when the actual revision is 140?
Go to [...]]]></description>
			<content:encoded><![CDATA[<p>Sometimes you have to revert changes in svn from lets say a commit you made some days ago. Since then more commits where done and this can be a hard job to undo your changes. So how to undo the changes e.g. from your change in revision 120 when the actual revision is 140?</p>
<p>Go to your trunk workdir and use the following:</p>

<div class="wp_codebox_msgheader"><span class="right"><sup><a href="http://www.ericbess.com/ericblog/2008/03/03/wp-codebox/#examples" target="_blank" title="WP-CodeBox HowTo?"><span style="color: #99cc00">?</span></a></sup></span><span class="left"><a href="javascript:;" onclick="javascript:showCodeTxt('p236code3'); return false;">View Code</a> BASH</span><div class="codebox_clear"></div></div><div class="wp_codebox"><table width="100%" ><tr id="p2363"><td class="line_numbers"><pre>1
</pre></td><td class="code" id="p236code3"><pre class="bash" style="font-family:monospace;">mvn merge <span style="color: #660033;">-r</span> <span style="color: #000000;">120</span>:<span style="color: #000000;">119</span> http:<span style="color: #000000; font-weight: bold;">//</span>my.svn.repo<span style="color: #000000; font-weight: bold;">/</span>trunk<span style="color: #000000; font-weight: bold;">/</span></pre></td></tr></table></div>

<p>The changes you made will be reverted. If there are some conflicts they will be shown.<br />
Maybe it is a good idea to make a dry run via:</p>

<div class="wp_codebox_msgheader"><span class="right"><sup><a href="http://www.ericbess.com/ericblog/2008/03/03/wp-codebox/#examples" target="_blank" title="WP-CodeBox HowTo?"><span style="color: #99cc00">?</span></a></sup></span><span class="left"><a href="javascript:;" onclick="javascript:showCodeTxt('p236code4'); return false;">View Code</a> BASH</span><div class="codebox_clear"></div></div><div class="wp_codebox"><table width="100%" ><tr id="p2364"><td class="line_numbers"><pre>1
</pre></td><td class="code" id="p236code4"><pre class="bash" style="font-family:monospace;">mvn merge <span style="color: #660033;">--dry-run</span> <span style="color: #660033;">-r</span> <span style="color: #000000;">120</span>:<span style="color: #000000;">119</span> http:<span style="color: #000000; font-weight: bold;">//</span>my.svn.repo<span style="color: #000000; font-weight: bold;">/</span>trunk<span style="color: #000000; font-weight: bold;">/</span></pre></td></tr></table></div>

<p>So no changes are really made but only shows them.</p>
<p>Of course you can use this for reverting merges.</p>
]]></content:encoded>
			<wfw:commentRss>http://www.sobek.info/blog/2010/03/25/revert-changes-in-svn/feed/</wfw:commentRss>
		<slash:comments>0</slash:comments>
		</item>
	</channel>
</rss>

