[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Tree conflict with folder added on branch and trunk

From: Ben Fritz <fritzophrenic_at_gmail.com>
Date: Wed, 6 Aug 2014 11:48:02 -0500

On Tue, Aug 5, 2014 at 1:26 PM, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
>> Choosing to accept current working copy state claims to do the adds of
>> the "lib" directory and its contents, but my working copy remains
>> unchanged, and there is nothing for the "lib" directory in the commit
>> dialog or check for modifications. This doesn't work to get the "lib"
>> directory at all.
> "Accept current working copy state" does not claim to add anything, what
> this means is that what you have in your working copy is accepted as
> correct, and what should be merged is discarded. Exactly what it does.

I know that. But when I choose that option, I see in the merge status window:

Tree conflict (Resolved): C:\Project_Files\WC\host
Added: C:\Project_Files\WC\host\lib\lib.sln
Added: C:\Project_Files\WC\host\lib\project\lib.vcxproj


But these files are not actually created. It looks like SOMEWHERE in
SVN it thought it was adding those files during the merge, but
actually those files did not get added.

>> So what can I do to resolve the conflict manually? Do I just svn copy
>> the "lib" directory into my working copy? I cannot find an option in
>> the repository browser to copy with history to my working copy. Do I
>> need to drop to the command-line for this operation?
> You should not have created the same folders in your branch as you did
> on trunk.

Yeah I guess I learned my lesson there.

> You should have merged the revision where you created those
> folders on trunk from trunk to your branch.

Actually I created "host" on my branch first, and my branch was not
ready to merge yet, nor is the unit test for my feature needed on
trunk until the branch merges.

> That way SVN knows that
> those folders are related. Now, SVN does not know this and throws an
> error telling you that the folders it tries to merge already exist.

Yes, I understand why the "tree conflict" happened. I was just hoping
SVN would be smarter about letting me grab the "lib" subdirectory
during the merge, since that directory does *not* exist on my branch.
I thought it WAS being smart about it since I saw the "added" lines in
the merge results, but I guess no such luck.

> Try the merge with the option "ignore ancestry", maybe that will the
> merge to succeed (not sure though). Also try "force the merge".

"ignore ancestry" did not change the results at all. The merge results
window shows the "lib" directory being added, but the directory does
not actually get added. "tree conflict" still appears as expected.

Same for "force merge".

I actually see the same results from the command-line as well, I'll
try on the SVN mailing list.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-08-06 18:48:30 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.