##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

repo.status: also compare flags for files in the lookup list....
repo.status: also compare flags for files in the lookup list. We might be able to do something smarter about this in dirstate.status for files in normallookup state, but that would require some extra care to keep backwards compatibility.
Brendan Cully - - Load All Authors

File last commit:

r4437:a210b40d default
r6158:23ffe826 default
Show More
test-mq-merge.out
12 lines | 217 B | text/plain | TextLexer
/ tests / test-mq-merge.out
History | Source | Raw |Copy content |Copy permalink
Patrick Mezard
Add test for issue 529 - "mq aborts when merging patch deleting files".
 r4333 adding a
adding b
copy .hg/patches to .hg/patches.1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
M b
a
b
merging with queue at: .hg/patches.1
applying rm_a
Now at: rm_a
b
Brendan Cully
Make mergepatch save queue now that qpush isn't.
 r4437 Patch queue now empty