Re: diff wish
From: Peter Samuelson <peter_at_p12n.org>
Date: Tue, 14 Jun 2011 11:50:39 -0500
[Neels J Hofmeyr]
While we're on the subject of 'diff wish', my wish is that diff3 could
-- Peter Samuelson | org-tld!p12n!peter | http://p12n.org/ [[[ Repro script. The merge conflict region that shows up in TMP_wc/f is too large. ]]] #!/bin/sh -x rm -fr TMP_repos TMP_wc svnadmin create TMP_repos svn co file://$(pwd)/TMP_repos TMP_wc cd TMP_wc # r1: Create file f cat > f <<EOF a b EOF svn add f svn ci -mm # r2: Branch, then do conflicting edits to both files svn cp f g cat > f <<EOF a 1 3 b EOF cat > g <<EOF a 1 2 3 b EOF svn ci -mm # Finally, produce a merge conflict svn merge --non-interactive -c2 g fReceived on 2011-06-14 19:55:09 CEST
This is an archived mail posted to the Subversion Dev mailing list.