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

RE: resolve conflict dialog is confusing

From: Bob Archer <Bob.Archer_at_amsi.com>
Date: Thu, 2 Sep 2010 12:48:34 -0400

> David Huang wrote:
> > I'm not sure what you mean by "my action is on a working copy of
> > something that points to a different repository." You can't merge
> > between two repositories. The merge source is the repository, the
> > merge destination is your local working copy, which was created
> > from that same repository.
>
> Sorry I don't have the terminology in hand, reading your response
> suggests I meant "two revisions in the repository." I'm merging
> changes contained in a branch to a working copy of the trunk.
>
> The ambiguity is which of two versions in the repository that "use
> repository" refers to. For a mod of a working copy of the trunk,
> using changes contained in a branch in the repository, it (now,
> thank
> you) seems clear enough that Tortoise refers to the branch version
> in
> the repository.
>
> > Not sure what you mean by "conflicts between those 2 source
> URLs".
>
> If you're merging two trees, there are two source URLs, and two
> versions in the repository at issue. Does it offer the choice to
> "Use
> repository" for that, and if so, which one does it refer to?

When you do a merge svn does a DIFF between the two URLs that you specify (or that merge track determines to be correct). If that diff... lets say LINE 125 was edited is applied to a local file in which YOU also edit LINE 125 there would be an conflit. So, you can choose "Take LINE 125 as it is in my working copy" (Use Local) or "Take LINE 125 that comes from the DIFF that occured against the two repo versions" (Use Repository).

Your best bet of course is to "Edit Conflict" with a 3-way merge tool like Torsoise Merge or Beyond Compare 3 so you can see the change in the LOCAL (yours), the Change in the REPOSITORY (thiers), the common base, The final result of the merge. I would never blindly take LOCAL or REPO unless it was a binary and I have no choice but to choose 1 or the other... or I KNOW for sure I just made a conflicting change and I want to use "mine" for it.

BOb

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-09-02 18:48:42 CEST

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