On Wed, Oct 28, 2009 at 12:47 PM, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
> On 28.10.2009 01:15, Robert Dailey wrote:
> > I'm using TortoiseSVN 1.6.5.
> >
> > When I do a Merge from trunk to a feature branch of mine, one of the
> > files shows up as a tree conflict. From the "Resolved..." dialog, I
> > right-click that item and go to "Edit Conflicts". A dialog appears
> saying:
> >
> > *"The last merge operation tried to add the file 'Animation.cpp', but it
> > was obstructed in the working copy.*
> > *
> > *
> > *Conflicted Sources:*
> > * Source Left: svn://domain.com/redsword_at_1825
> > <http://domain.com/redsword@1825>*
> > * Source Right: svn://domain.com/redsword_at_1935
> > <http://domain.com/redsword@1935>*
> > *
> > *
> > *How do you want to resolve this conflict?*
> > * >> Keep the file from the repository <<*
> > * >> Keep the local file <<"*
> >
> > I chose the "Keep the file from the repository" option. After clicking
> > that, an error dialog appears stating:
> >
> > *"Tree conflicts can only be resolved to 'working' state;*
> > *'E:\IT\work\project\Animation.cpp' not resolved"*
> >
> > Why is this happening?
>
> http://tortoisesvn.tigris.org/ChangeLog.txt
> - BUG: Resolving tree conflicts resulted in an error message. (Stefan)
That seems to resolve most of the issue, however I'm incredibly confused
about how tree conflicts work. The whole thing just feels unintuitive and
broken (I think the brokenness I'm witnessing is on the SVN API side, not
necessarily an issue with TSVN).
I'm doing a complex merge from revision 1797 to about 1980 or so... it's a
lot of changes. Problem is, when I created my branch, different sub
directories were updated at different times and to different revisions. So
when I try to do a merge from the root of my branch, some sub-directories
are getting duplicate changesets merged in. I think it handles this well for
the most part, however there's one particular tree conflict where I choose
to keep the version from the repository, but it ends up reverting the file
back to the version in the branch's head. I'm not sure what is going on.
What exactly does "Keep repository version" and "keep working version" mean?
what do both represent?
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2412226
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-10-28 20:21:48 CET