[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: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-08-01 16:40:44 CEST

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.

Stefan

-- 
        ___
   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 16:39:15 2007

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