Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-mq-qnew-twice.out @ 3387:ba7c74081861
merge: update dirstate correctly for non-branchmerge updates
- we don't actually need the context in recordupdates
- use -1 for filesize to force check on normal update
- only record copy for branchmerges
- forget moved files on update
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 13 Oct 2006 17:58:04 -0500 |
parents | 85070b784896 |
children |
rev | line source |
---|---|
2710
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 |
2713
85070b784896
Fix test-mq-qnew-twice exit code and output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2710
diff
changeset
|
2 abort: patch "first.patch" already exists |