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

Re: Getting merge conflicts during branch merge

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: 2007-08-01 17:02:04 CEST

On 01/08/07, Stefan Küng <tortoisesvn@gmail.com> wrote:
> Venkatesh Babu wrote:
> > Hi Stefan,
> >
> > I have one small question on this comment. Request your answer ...
> >
> > Quote - "I think this should be reversed: FROM: trunk@HEAD TO:
> > branch@HEAD
> >
> > because you want the changes that happened between the time you
> > created the branch from trunk until the end of the branch.
> >
> > But the better solution would be to use FROM:
> > branch@revision-where-branch-was-created TO: branch@HEAD"
> > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> >
> >
> > From the comments, it is clear that the merge results will be present
> > in local machine ... In fact, I tried your approach of Merge from
> > HEAD to branch HEAD and store the results in local file system. This
> > merge succeeded without any conflicts ... I'm not clear on how to
> > proceed from this point ... If I commit the changes, the commit is
> > happening in branch whereas I want the changes to appear in the trunk
> You said that your working copy is checked out from trunk. If you merged
> the changes to that working copy, a commit will go to the trunk.
> But if your working copy is still pointing to the branch, then of course
> the merge will produce conflicts, no matter what FROM and TO urls you're
> using.

Please read our docs again. It seems that you are missing some of the
fundamental concepts here:
1. Merging always takes place in a local working copy. You then commit
the results to the repository. If this were not the case there would
be no way to handle conflicts, or to test the results before
2. FROM and TO refer to the two points you are using to create the
diff which gets merged, not to the fact that you are merging FROM a
branch TO trunk.


  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Wed Aug 1 17:00:39 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.