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

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

phabricator: warn if unable to amend, instead of aborting after posting...
phabricator: warn if unable to amend, instead of aborting after posting There was a divergence in behavior here between obsolete and strip based amending. I first noticed the abort when testing outside of the test harness, but then had trouble recreating it here after reverting the code changes. It turns out, strip based amend was successfully amending the public commit after it was posted! It looks like the protection is in the `commit --amend` command, not in the underlying code that it calls. I considered doing a preflight check and aborting. But the locks are only acquired at the end, if amending, and this is too large a section of code to be wrapped in a maybe-it's-held-or-not context manager for my tastes. Additionally, some people do post-push reviews, and amending is the default behavior, so they shouldn't see a misleading error message. The lack of a 'Differential Revision' entry in the commit message breaks a {phabreview} test, so it had to be partially conditionalized.
Sushil khanchi - - Load All Authors

File last commit:

r39442:cb70501d default
r41198:0101a35d default
Show More
test-confused-revert.t
82 lines | 1.2 KiB | text/troff | Tads3Lexer
/ tests / test-confused-revert.t
History | Source | Raw |Copy content |Copy permalink
Adrian Buehlmann
tests: unify test-confused-revert
 r12284 $ hg init
$ echo foo > a
$ hg add a
$ hg commit -m "1"
$ echo bar > b
$ hg add b
$ hg remove a
Should show a removed and b added:
$ hg status
A b
R a
$ hg revert --all
Sushil khanchi
revert: fix the inconsistency of status msgs in --interactive mode...
 r39442 forgetting b
Adrian Buehlmann
tests: unify test-confused-revert
 r12284 undeleting a
Should show b unknown and a back to normal:
$ hg status
? b
$ rm b
$ hg co -C 0
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo foo-a > a
$ hg commit -m "2a"
$ hg co -C 0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo foo-b > a
$ hg commit -m "2b"
created new head
$ HGMERGE=true hg merge 1
merging a
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
Should show foo-b:
$ cat a
foo-b
$ echo bar > b
$ hg add b
$ rm a
$ hg remove a
Should show a removed and b added:
$ hg status
A b
R a
Revert should fail:
timeless
revert: improve merge advice and favor its error over all
 r13022 $ hg revert
Matt Mackall
revert: restore check for uncommitted merge (issue2915) (BC)...
 r14903 abort: uncommitted merge with no revision specified
timeless
graft: use single quotes around command hint...
 r28963 (use 'hg update' or see 'hg help revert')
Matt Mackall
tests: add exit codes to unified tests
 r12316 [255]
Adrian Buehlmann
tests: unify test-confused-revert
 r12284
Revert should be ok now:
$ hg revert -r2 --all
Sushil khanchi
revert: fix the inconsistency of status msgs in --interactive mode...
 r39442 forgetting b
Adrian Buehlmann
tests: unify test-confused-revert
 r12284 undeleting a
Should show b unknown and a marked modified (merged):
$ hg status
M a
? b
Should show foo-b:
$ cat a
foo-b