Mercurial > hg
annotate tests/test-mq-qnew-twice.out @ 4416:bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
We make better use of contexts to accurately identify copies that
don't need merges.
Add a simple test and update other tests.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 08 May 2007 02:59:13 -0500 |
parents | 85070b784896 |
children |
rev | line source |
---|---|
2711
ca97be5babf8
mq: do not allow to qnew a patch twice
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
1 abort: patch "first.patch" already exists |
2714
85070b784896
Fix test-mq-qnew-twice exit code and output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2711
diff
changeset
|
2 abort: patch "first.patch" already exists |