Bryan Slatner wrote:
> Using Tortoise 1.6.6.17493. Repository is version 1.6.
>
> I'm trying to educate myself (and my team) on resolving merge
> conflicts. However, I'm really not understanding certain tree
> conflict errors that often pop up.
>
> Here's an example (see attached screenshots for reference).
> Yesterday, I made a branch from the trunk in a project, made a bunch
> of changes, and am now attempting a "Reintegrate Branch" operation.
>
> No modifications have been made to the trunk since I made the branch,
> and I did not touch these 4 files in my branch. If you look at the
> log for these files in the branch, the first line shows that I copied
> it to my branch, and the second line shows the current trunk
> revision.
>
> So, first, I'd like to understand why this tree conflict exists?
The tree conflict dialog tells you:
"The last merge operation tried to add the file 'reportexpired.aspx',
but it was already added locally."
Check the log for that file, maybe you've replaced that file earlier?
>
> My other questions the conflict resolution dialog itself (see
> attached):
>
> 1) Where did the revision numbers 5951 and 6012 come from in the
> "Source left" and "Source right" fields? 6012 is higher than any
> revision in the repository, as far as I can tell, and 5951 is way
> less than the current trunk.
Those revision numbers come from the revisions that svn tries to merge.
From your description it's not clear from which working copy (trunk or
branch) you attempted the 'reintegrate' merge. But since those revision
numbers are not what you expect I guess you're trying to reintegrate
trunk into the branch - that's wrong. You can only reintegrate the
branch into the trunk.
> 2) There is a "show log" button there...but what is it showing the
> log of? The trunk? The branch? A combination of both?
It shows the log of the parent folder of the tree-conflicted item.
> 3) How come I can't VIEW and/or compare both revisions? It's very
> hard for me to decide which file to keep when I have no idea the
> contents. I can go to my local copy to view the "local file", but I'd
> like to be able to see the repository version too.
Resolving tree conflicts is still a very manual operation, there's not
much help from svn or TSVN available. I know there's a lot which can
(and has to be) improved in that area, but I can do that in TSVN only
after the svn lib provides more API's to get the required information.
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2418087
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-11-15 09:10:03 CET