subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Stefan Sperling <s...@elego.de>
Subject Re: Merge bringing in much more than the specified changes
Date Wed, 10 Oct 2012 20:29:17 GMT
On Wed, Oct 10, 2012 at 01:04:02PM -0400, Kris Deugau wrote:
> I've just come across a very strange merge glitch;  I don't recall
> seeing anything like it reported and I'm not sure if I'm just doing
> something wrong or not.
> 
> $ svn --version
> svn, version 1.6.15 (r1038135)
> 
> (from the RPMForge repo, on CentOS 5)
> 
> I have a project that is very close to a new stable release, but I've
> also had a couple of bugs reported that I've fixed in /trunk and I'm
> backporting to /branches/stable in the meantime.
> 
> I just tried merging the commits for one of these bugfixes, but I'm
> getting a lot more code merged than I see from svn diff -c on the
> relevant revisions.
> 
> The repository is public at https://secure.deepnet.cx/svn/dnsadmin;  I'm
> trying to merge revisions 417 and 418 from /trunk to /branches/stable.
> 
> Merging r417 I end up with an extra ~150 new lines in the third fragment
> - not part of the commit in r417, so far as I can see, and which I'm
> pretty sure was committed quite a while ago (before ~r330 or so).
> 
> -kgd

This is not a conflict-free merge when I try it (into a working
copy of ^/branches/stable@418):

$ svn merge -c417 ^/trunk             
--- Merging r417 into '.':
C    DNSDB.pm
--- Recording mergeinfo for merge of r417 into '.':
 U   .
Summary of conflicts:
  Text conflicts: 1
Conflict discovered in file 'DNSDB.pm'.
Select: (p) postpone, (df) diff-full, (e) edit, (m) merge,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: p

If there is a conflict during a cherry-pick merge, this kind of
thing can happen.

Please see this post and the replies to it:
  http://svn.haxx.se/users/archive-2011-10/0821.shtml
My own reply which tries to explain the problem is here:
  http://svn.haxx.se/users/archive-2011-10/0832.shtml
The other replies are well worth reading, too.

Mime
View raw message