[prev in list] [next in list] [prev in thread] [next in thread] 

List:       darcs-devel
Subject:    Re: [darcs-devel] [issue1817] merge regression [status=waiting-for]
From:       Eric Kow <kowey () darcs ! net>
Date:       2010-04-26 18:04:47
Message-ID: 20100426180446.GC17349 () brighton ! ac ! uk
[Download RAW message or body]

[Attachment #2 (multipart/signed)]


On Sun, Apr 18, 2010 at 11:10:22 +0000, Dave Love wrote:
> With the current 2.4-ish source, when I get put into the external merge
> tool I seem invariably to get an empty `variant A' and a single marked
> conflict covering the whole of variant B.  With Ubuntu's 2.3.0 I get a
> sensible result with a non-empty A and the expected small regions in
> which to resolve conflicts.  I'm surprised it doesn't seem to have been
> reported already, or have I failed to find it in the bug tracker.  I'm
> not sure how easily I can construct a simple test case, but I'll have a
> go if you need it.

Hmm, yes, if you could at least give us an informal recipe for
reproducing it, that would be a good start.  A test case would
be even better.

Cheers,

--=20
Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow>
PGP Key ID: 08AC04F9

["signature.asc" (application/pgp-signature)]

_______________________________________________
darcs-devel mailing list (AUTOMATIC POSTINGS ONLY PLEASE!)
darcs-devel@darcs.net
http://lists.osuosl.org/mailman/listinfo/darcs-devel


[prev in list] [next in list] [prev in thread] [next in thread]