annotate tests/test-merge8.t @ 41163:0101a35deae2

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.
author Matt Harbison <matt_harbison@yahoo.com>
date Sat, 05 Jan 2019 15:20:33 -0500
parents eb586ed5d8ce
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
11981
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
1 Test for changeset ba7c74081861
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
2 (update dirstate correctly for non-branchmerge updates)
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
3 $ hg init a
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
4 $ cd a
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
5 $ echo a > a
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
6 $ hg add a
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
7 $ hg commit -m a
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
8 $ cd ..
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
9 $ hg clone a b
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
10 updating to branch default
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
11 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
12 $ cd a
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
13 $ hg mv a b
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
14 $ hg commit -m move
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
15 $ echo b >> b
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
16 $ hg commit -m b
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
17 $ cd ../b
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
18 $ hg pull ../a
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
19 pulling from ../a
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
20 searching for changes
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
21 adding changesets
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
22 adding manifests
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
23 adding file changes
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
24 added 2 changesets with 2 changes to 1 files
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 16913
diff changeset
25 new changesets e3c9b40284e1:772b37f1ca37
11981
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
26 (run 'hg update' to get a working copy)
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
27 $ hg update
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
28 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 11981
diff changeset
29
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 11981
diff changeset
30 $ cd ..