Re: merge disagrees with diff
From: Flemming Frandsen <dren.dk_at_gmail.com>
Date: Fri, 28 Oct 2011 14:32:39 +0200
On Fri, Oct 28, 2011 at 2:00 PM, Andreas Krey <a.krey_at_gmx.de> wrote:
Aaah! RTFM, is it?
> In essence, svn sees only two different (and conflicting) changes to
My god man! you're right!
I've managed to write a very minimal test case which demonstrates the problem:
#!/usr/bin/perl
system("svnadmin create repo") and die;
open A, ">checkout/a" or die "Failed to create a: $!";
open B, ">checkout/b" or die "Failed to create b: $!";
system("svn", "add", "checkout/a", "checkout/b") and die;
open B, ">checkout/b" or die "Failed to create b: $!";
system("svn", "ci", "checkout", "-m", "Added an extra line") and die;
system("svn", "diff", "-c", '2', "file://$Bin/repo") and die;
system("svn", "merge", '--non-interactive', "-c", '2',
The change to b that I merge is:
The conflict in a ends up being:
I'm comforted that this only happens when there is a conflict, but
Thank you all for your time.
-- Flemming Frandsen - YAPH - http://osaa.dk - http://dren.dk/Received on 2011-10-28 14:33:10 CEST |
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.