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

Re: Re: Need information on tree conflicts

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: Tue, 19 May 2009 22:08:58 +0100

2009/5/18 Chuck Holzwarth <chuck_holzwarth_at_yahoo.com>:
> So, tree conflict resolution works opposite of the way text conflicts work?

No, exactly the same.

> For textual conflicts:
> I start with the checkout of a branch.
> I merge the other branch onto the working copy.
> For a text conflict, the repository copy in the branch that is the base of my working copy.
> The incoming code is the current working copy.

Your description with "branch" and "other branch" is a little
confusing, and some of your sentences seem incomplete. I have no idea
what you mean by this.

> What we are experiencing is that a directory does not exist in either branch to start with. ProgrammerA creates the directory in brancA. Programmer creates a direcotry with the same name and in the same point in the hierarchy in branchB. Files are added to the directories on both branches. branchA is merged to a release branch and checked in. The release goes to production and the release branch is merged to the trunk. A new release branch is created as a copy of the trunk. When we try to merge branchB to the new release branch, we get a tree conflict for the directory. For our part, we are choosing to keep the directory object from the trunk as the master object since other subsequently created branches will be using that object.
> I see the tree conflict in the merge result. I use check for modifications and use edit conflicts on the tree conflict. I see:
> Source left:
> Source right:
> Button - Keep the directory from the repository
> Button - Keep the local directory
> In the case where I am merging the branch to the trunk, I want to keep the object from the trunk.
> I checked out the trunk and used the merge functionality to choose the branch to merge onto my copy of the trunk.
> Both directories come from the repository, just different places in the repository. For text conflicts, I expect the local info to be the incoming text changes while the repository info would be the base of the local working copy. In this case, which do I use?

Well of course everything comes from the repository in one sense -
that's the whole point of revision control. But the working copy is
the only part which is on your local hard drive. In the example you
described, your working copy is a checkout of trunk. You are merging
from branchB into your local working copy of trunk.

Local directory = working copy = trunk
Repository directory = merge source = branchB


:       ___
:  oo  // \\      "De Chelonian Mobile"
: (_,\/ \_/ \     TortoiseSVN
:   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
:   /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-05-19 23:09:11 CEST

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