<?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: svn Skipped &#8216;path/to/file&#8217; is misleading</title>
	<atom:link href="http://www.tecnotertulia.com/development/svn-skipped-pathtofile-is-misleading/96/feed" rel="self" type="application/rss+xml" />
	<link>http://www.tecnotertulia.com/development/svn-skipped-pathtofile-is-misleading/96</link>
	<description>Observations at the Humanities and Technology Crossroads</description>
	<lastBuildDate>Mon, 05 Dec 2011 18:07:49 +0000</lastBuildDate>
	<sy:updatePeriod>hourly</sy:updatePeriod>
	<sy:updateFrequency>1</sy:updateFrequency>
	<generator>http://wordpress.org/?v=3.2.1</generator>
	<item>
		<title>By: Dr Jones</title>
		<link>http://www.tecnotertulia.com/development/svn-skipped-pathtofile-is-misleading/96/comment-page-1#comment-6335</link>
		<dc:creator>Dr Jones</dc:creator>
		<pubDate>Wed, 08 Sep 2010 15:57:06 +0000</pubDate>
		<guid isPermaLink="false">http://www.tecnotertulia.com/development/svn-skipped-pathtofile-is-misleading/96#comment-6335</guid>
		<description>&lt;p&gt;Thank you for posting this. It definitely helped.&lt;/p&gt;

&lt;p&gt;I believe I figured out why this happens. I was merging from branch to trunk. I noticed some conflicts and realized I hadn&#039;t done something in my branch that I wanted to before I merged. So I &quot;svn revert&quot; all the merge changes (so I did not commit/chick in the merge). Then I made the change I needed in my branch.&lt;/p&gt;

&lt;p&gt;I merged from branch to trunk again and this time I got that &quot;skipped&quot; error on a file (file1.cs). When I found your post here I realized what happened.&lt;/p&gt;

&lt;p&gt;When I reverted the files instead of merging, it reverted all the files that existed in the trunk already, but it did not revert/remove the new file that came from the branch (file1.cs). So svn was seeing that file there but wasn&#039;t sure what it was. So I had to browse to the file, right-click, and &quot;svn add&quot; the file manually.&lt;/p&gt;

&lt;p&gt;So svn &quot;skipped&quot; the file because it was already in the trunk folder, but it wasn&#039;t a conflict/merge because it wasn&#039;t an svn file yet (it had never been checked in to the trunk).&lt;/p&gt;

&lt;p&gt;I hope that made sense, and I hope that helps clarify a little more what the &quot;skipped&quot; error means.&lt;/p&gt;
</description>
		<content:encoded><![CDATA[<p>Thank you for posting this. It definitely helped.</p>

<p>I believe I figured out why this happens. I was merging from branch to trunk. I noticed some conflicts and realized I hadn&#8217;t done something in my branch that I wanted to before I merged. So I &#8220;svn revert&#8221; all the merge changes (so I did not commit/chick in the merge). Then I made the change I needed in my branch.</p>

<p>I merged from branch to trunk again and this time I got that &#8220;skipped&#8221; error on a file (file1.cs). When I found your post here I realized what happened.</p>

<p>When I reverted the files instead of merging, it reverted all the files that existed in the trunk already, but it did not revert/remove the new file that came from the branch (file1.cs). So svn was seeing that file there but wasn&#8217;t sure what it was. So I had to browse to the file, right-click, and &#8220;svn add&#8221; the file manually.</p>

<p>So svn &#8220;skipped&#8221; the file because it was already in the trunk folder, but it wasn&#8217;t a conflict/merge because it wasn&#8217;t an svn file yet (it had never been checked in to the trunk).</p>

<p>I hope that made sense, and I hope that helps clarify a little more what the &#8220;skipped&#8221; error means.</p>]]></content:encoded>
	</item>
	<item>
		<title>By: Joe</title>
		<link>http://www.tecnotertulia.com/development/svn-skipped-pathtofile-is-misleading/96/comment-page-1#comment-2309</link>
		<dc:creator>Joe</dc:creator>
		<pubDate>Thu, 30 Apr 2009 16:32:28 +0000</pubDate>
		<guid isPermaLink="false">http://www.tecnotertulia.com/development/svn-skipped-pathtofile-is-misleading/96#comment-2309</guid>
		<description>&lt;p&gt;I just ran into this and after being unable to figure out what the hell it meant, went on a several minute swearing tirade.&lt;/p&gt;

&lt;p&gt;So your blog post helped me a great deal, thanks.&lt;/p&gt;
</description>
		<content:encoded><![CDATA[<p>I just ran into this and after being unable to figure out what the hell it meant, went on a several minute swearing tirade.</p>

<p>So your blog post helped me a great deal, thanks.</p>]]></content:encoded>
	</item>
</channel>
</rss>

