Mercurial > public > mercurial-scm > hg-stable
diff tests/test-simplemerge-cmd.t @ 14328:3c65cdcf3ba6 stable
simplemerge: do not allow binary files to abort an entire merge
When used as the default merge tool, or used as a --tool override,
the simplemerge script should not be allowed to raise a util.Abort
just because one of the files being merged is binary. Instead, return
1 and mark the file unresolved.
| author | Steve Borho <steve@borho.org> |
|---|---|
| date | Fri, 13 May 2011 19:46:36 -0500 |
| parents | 7439ea4146f8 |
| children |
line wrap: on
line diff
--- a/tests/test-simplemerge-cmd.t Mon May 09 10:46:54 2011 +0200 +++ b/tests/test-simplemerge-cmd.t Fri May 13 19:46:36 2011 -0500 @@ -99,8 +99,8 @@ $ python -c "f = file('binary-local', 'w'); f.write('\x00'); f.close()" $ cat orig >> binary-local $ python simplemerge -p binary-local base other - abort: binary-local looks like a binary file. - [255] + warning: binary-local looks like a binary file. + [1] binary file --text