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

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

mq: pop/refresh: avoid losing revisions not managed by mq...
mq: pop/refresh: avoid losing revisions not managed by mq We already disallow committing on top of an mq revision exactly to avoid losing this new revision during a qpop/qrefresh, so this can be seen as an additional safety check. If this is not enough to fix issue844, it should at least prevent it from happening.
Patrick Mezard - - Load All Authors

File last commit:

r5688:883d887c default
r5980:dcda0c90 default
Show More
test-add
42 lines | 363 B | text/plain | TextLexer
/ tests / test-add
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
hg init a
cd a
echo a > a
hg add -n
hg st
hg add
hg st
echo b > b
hg add -n b
hg st
hg add b
hg st
echo % should fail
hg add b
hg st
hg ci -m 0
echo % should fail
hg add a
echo aa > a
hg ci -m 1
hg up 0
echo aaa > a
hg ci -m 2
hg merge
hg st
echo % should fail
hg add a
hg st
hg ci -m merge
echo % issue683
hg rm a
hg st
echo a > a
hg add a
hg st