<?xml version="1.0" encoding="UTF-8"?><rss version="2.0"
	xmlns:content="http://purl.org/rss/1.0/modules/content/"
	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/"
	>
<channel>
	<title>Comments on: How-to: &#8220;svn update &#0045;-dry-run&#8221;</title>
	<atom:link href="http://translocator.ws/2005/10/12/svn-update-dry-run/feed" rel="self" type="application/rss+xml" />
	<link>http://translocator.ws/2005/10/12/svn-update-dry-run</link>
	<description>...transporting ideas...</description>
	<pubDate>Sat, 19 May 2012 03:21:49 +0000</pubDate>
	<generator>http://wordpress.org/?v=2.7.1</generator>
	<sy:updatePeriod>hourly</sy:updatePeriod>
	<sy:updateFrequency>1</sy:updateFrequency>
		<item>
		<title>By: MaciekD</title>
		<link>http://translocator.ws/2005/10/12/svn-update-dry-run/comment-page-1#comment-12154</link>
		<dc:creator>MaciekD</dc:creator>
		<pubDate>Thu, 25 Jan 2007 10:10:37 +0000</pubDate>
		<guid isPermaLink="false">http://translocator.ws/2005/10/12/svn-up-dry-run#comment-12154</guid>
		<description>This should help:

svn status --show-updates</description>
		<content:encoded><![CDATA[<p>This should help:</p>
<p>svn status &#8211;show-updates</p>
]]></content:encoded>
	</item>
	<item>
		<title>By: Hayden</title>
		<link>http://translocator.ws/2005/10/12/svn-update-dry-run/comment-page-1#comment-138</link>
		<dc:creator>Hayden</dc:creator>
		<pubDate>Thu, 06 Apr 2006 15:24:42 +0000</pubDate>
		<guid isPermaLink="false">http://translocator.ws/2005/10/12/svn-up-dry-run#comment-138</guid>
		<description>Unfortunately, it just doesn't alwyas work correctly. It can report conflicts that are simply impossible. Here's an example using svn 1.2.1:

qa21 haydens/work/trunk&gt; svn merge --dry-run -r BASE:HEAD . &#124; grep ^C
C    clients/c++/TupleConnection.cpp
C    test/xml/join.xml
C    test/xml/modules.xml
qa21 haydens/work/trunk&gt; svn stat test/xml/join.xml test/xml/modules.xml
qa21 haydens/work/trunk&gt; svn diff test/xml/join.xml test/xml/modules.xml
qa21 haydens/work/trunk&gt;

Note that the 2nd and 3rd conflict isn't possible because the two files haven't been changed (or even touched).</description>
		<content:encoded><![CDATA[<p>Unfortunately, it just doesn&#8217;t alwyas work correctly. It can report conflicts that are simply impossible. Here&#8217;s an example using svn 1.2.1:</p>
<p>qa21 haydens/work/trunk&gt; svn merge &#8211;dry-run -r BASE:HEAD . | grep ^C<br />
C    clients/c++/TupleConnection.cpp<br />
C    test/xml/join.xml<br />
C    test/xml/modules.xml<br />
qa21 haydens/work/trunk&gt; svn stat test/xml/join.xml test/xml/modules.xml<br />
qa21 haydens/work/trunk&gt; svn diff test/xml/join.xml test/xml/modules.xml<br />
qa21 haydens/work/trunk&gt;</p>
<p>Note that the 2nd and 3rd conflict isn&#8217;t possible because the two files haven&#8217;t been changed (or even touched).</p>
]]></content:encoded>
	</item>
</channel>
</rss>

