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

Re: Issues with Renaming the Branch

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Mon, 28 Apr 2014 19:59:00 +0200

On 28.04.2014 18:21, Vaibhav Deshpande wrote:
> Hi,
> I normally work on multiple branches in SVN and then we merge these changes as desired from one branch to other and it always worked for us.
> But recently I need to rename our branches. After renaming we decided to merge 2 comits from branch A to branch B. The merge was completed without any conflits.
> but later I reliased that though SVN is showing merge is successfull it actually did not merge the code.
>
> does anyone come across similar situation?

Haven't seen this before, no.

What svn version is your server? If it's old, then maybe one of the many
bugfixes would solve the problem?
Another thing to consider: did you check the box "ignore ancestry" in
the last page of the merge wizard? I'm not sure, but it might affect
your situation since a rename is basically a move, and moves affect the
ancestry.
Also, if a merge shows up as successful but nothing gets merged, that
usually happens if the revisions/changes were already merged or marked
as such.

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=3077196
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-04-28 19:58:57 CEST

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