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.

Attachments

• unnamed

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,

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

The following patch updated the status of issue1817 to be resolved:

* Resolve issue1817: --external-merge broken, by bumping h-s dependency to 0.5.1. 
Ignore-this: 65630f4ed7a4b7c6f61acd6a9b39b582

This h-s releases fixes a problem in index handling code where reading files
from a Tree that was created from an index only worked in the same working
directory in which the index had been opened. This was breaking
externalResolution which called readBlob on index'd files (working) from a
temporary directory.

The following patch updated issue issue1817 with status=resolved;resolvedin=2.5.0 (current)

* Resolve issue1817: --external-merge broken, by bumping h-s dependency to 0.5.1. 
Ignore-this: 65630f4ed7a4b7c6f61acd6a9b39b582

This h-s releases fixes a problem in index handling code where reading files
from a Tree that was created from an index only worked in the same working
directory in which the index had been opened. This was breaking
externalResolution which called readBlob on index'd files (working) from a
temporary directory.