Re: using xdl_merge(), was Re: Resolving conflicts

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Dec 5, 2006, 18:53 UTC
Message-ID: <Pine.LNX.4.63.0612051949290.28348@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <Pine.LNX.4.64.0612051023460.3542@woody.osdl.org>

Hi,

On Tue, 5 Dec 2006, Linus Torvalds wrote:

>  - take every single merge in git (or the kernel, if you want even more)

I tried that already. Only to find that the first merge I tested showed one change between RCS merge and xdl_merge(): xdl_merge() does not yet take context into account, so these two diffs

@@ bla
 Ten
+weary
 footsore
+wanderers
 all
 in
 a

and

@@ blub
 Ten
+weird
 footsore
 all
 in
 a

will conflict only for the weary/weird lines, _not_ for wanderers.

Besides, my recent patch series was gained exactly by that test. Though I did not extend that test to the Linux repo, and I am by no means finished with the git one.

Ciao,