Tree conflict cannot be resolved

[Robert Dailey]

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@1825

  Source Right: svn://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?

---------
Robert Dailey

[Stefan Küng]

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@1825
> <http://domain.com/redsword@1825>*
> * Source Right: svn://domain.com/redsword@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)

--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2412196

To unsubscribe from this discussion, e-mail: [dev-uns...@tortoisesvn.tigris.org].

[Robert Dailey]

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? 

[Lübbe Onken]

Am 28.10.2009 20:21, schrieb Robert Dailey:
> I'm doing a complex merge from revision 1797 to about 1980 or so... it's
> a lot of changes.

From Napoleon to Ronald Reagan. A lot happened in these 183 years. You
should integrate more often :)

SCNR
- Lübbe

--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control

/_/ \_\ http://tortoisesvn.net PGP Key ID 0x23F511AB

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2412471

[Robert Dailey]

On Thu, Oct 29, 2009 at 3:21 AM, Lübbe Onken <luebbe.to...@googlemail.com> wrote:

Am 28.10.2009 20:21, schrieb Robert Dailey:

> I'm doing a complex merge from revision 1797 to about 1980 or so... it's
> a lot of changes.

 From Napoleon to Ronald Reagan. A lot happened in these 183 years. You
should integrate more often :)

Hah, cute.

However, this still doesn't explain why TortoiseSVN is still breaking. When that tree conflict comes in, it says a file was trying to be added that was already added. However, regardless of which button I press to resolve the tree conflict (i.e. keep local or keep repository) it does not change that file. Upon inspection of the file, it is the same one that I had added myself. I have to manually browse to the trunk and copy/paste over that file to get the changes merged over. 

[Stefan Küng]

On 29.10.2009 16:02, Robert Dailey wrote:
> On Thu, Oct 29, 2009 at 3:21 AM, Lübbe Onken
> <luebbe.to...@googlemail.com

Subversion 1.6.0 did resolve such conflicts properly. But then in (I
think) 1.6.2 that was removed due to some problems and now the API call
simply marks the conflict as resolved.

Stefan

--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2412791

[Robert Dailey]

On Thu, Oct 29, 2009 at 2:00 PM, Stefan Küng <torto...@gmail.com> wrote:

On 29.10.2009 16:02, Robert Dailey wrote:
> On Thu, Oct 29, 2009 at 3:21 AM, Lübbe Onken
> <luebbe.to...@googlemail.com

> <mailto:luebbe.to...@googlemail.com>> wrote:
>
>     Am 28.10.2009 20:21, schrieb Robert Dailey:
>      > I'm doing a complex merge from revision 1797 to about 1980 or
>     so... it's
>      > a lot of changes.
>
>       From Napoleon to Ronald Reagan. A lot happened in these 183 years. You
>     should integrate more often :)
>
>
> Hah, cute.
>
> However, this still doesn't explain why TortoiseSVN is still breaking.
> When that tree conflict comes in, it says a file was trying to be added
> that was already added. However, regardless of which button I press to
> resolve the tree conflict (i.e. keep local or keep repository) it does
> not change that file. Upon inspection of the file, it is the same one
> that I had added myself. I have to manually browse to the trunk and
> copy/paste over that file to get the changes merged over.

Subversion 1.6.0 did resolve such conflicts properly. But then in (I
think) 1.6.2 that was removed due to some problems and now the API call
simply marks the conflict as resolved.

Wow that's annoying. Are you aware of any plans on this specific issue? Seeing as how we're on 1.6.6, it has taken them a while to fix this properly. What do they intend to do? 

[Stefan Küng]

On 29.10.2009 20:48, Robert Dailey wrote:

> Wow that's annoying. Are you aware of any plans on this specific issue?
> Seeing as how we're on 1.6.6, it has taken them a while to fix this
> properly. What do they intend to do?

It should be much better in 1.7.

Stefan

--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2412806