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

Re: Merge bug? or I am missing something...

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Sat, 19 Jul 2008 10:31:10 +0200

Eric Liprandi wrote:
> Hi,
>
> Not sure this is a bug.
> I might not understand the whole merge tracking changes that came out
> with 1.5.
>
> Anyway...
> We have 2 branches (A and B).
> On the local machine, we update both branches to HEAD (though only 1
> matters, the target).
> We initiate the merge from A to B, for a single revision X.
> On the surface, it works great.
> The changes for revision X are correctly applied to Branch B.
> But all the sudden, we also have a slew of files that are marked as
> modified.
> Those modified files only have their property "snv:mergeinfo" changed.
> Committing all the pending changes has somehow random results.
> Committing only the files we know had change in revision X works
> always fine.
>
> Any pointers as to what is happening? are we misusing the tool?

When you merge, the svn:mergeinfo property gets changed. The property is
used by Subversion to track your merges. You *must* leave those
properties and properly commit them.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net

Received on 2008-07-19 10:31:28 CEST

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