Mercurial > hg-stable
annotate tests/test-merge-halt.t @ 34679:143337bcec9b
merge: add tests to show current behavior on failed filemerges
Currently, failed file merges will nevertheless force the user to continue
attempting to merge all additional unresolved files. Future patches will allow
the user to halt the merge process instead. This patch first introduces a test
demonstrating the current bejhavior so the upcoming changes are more obvious.
Differential Revision: https://phab.mercurial-scm.org/D930
author | Ryan McElroy <rmcelroy@fb.com> |
---|---|
date | Fri, 06 Oct 2017 06:48:43 -0700 |
parents | |
children | 284fa44f7f39 |
rev | line source |
---|---|
34679
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
1 $ cat >> $HGRCPATH <<EOF |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
2 > [extensions] |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
3 > rebase= |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
4 > [phases] |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
5 > publish=False |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
6 > [merge] |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
7 > EOF |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
8 |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
9 $ hg init repo |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
10 $ cd repo |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
11 $ echo a > a |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
12 $ echo b > b |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
13 $ hg commit -qAm ab |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
14 $ echo c >> a |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
15 $ echo c >> b |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
16 $ hg commit -qAm c |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
17 $ hg up -q ".^" |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
18 $ echo d >> a |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
19 $ echo d >> b |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
20 $ hg commit -qAm d |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
21 |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
22 Testing on-failure=continue |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
23 $ echo on-failure=continue >> $HGRCPATH |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
24 $ hg rebase -s 1 -d 2 --tool false |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
25 rebasing 1:1f28a51c3c9b "c" |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
26 merging a |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
27 merging b |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
28 merging a failed! |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
29 merging b failed! |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
30 unresolved conflicts (see hg resolve, then hg rebase --continue) |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
31 [1] |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
32 |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
33 $ hg resolve --list |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
34 U a |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
35 U b |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
36 |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
37 $ hg rebase --abort |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
38 rebase aborted |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
39 |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
40 Testing on-failure=halt |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
41 $ echo on-failure=halt >> $HGRCPATH |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
42 $ hg rebase -s 1 -d 2 --tool false |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
43 rebasing 1:1f28a51c3c9b "c" |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
44 merging a |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
45 merging b |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
46 merging a failed! |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
47 merging b failed! |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
48 unresolved conflicts (see hg resolve, then hg rebase --continue) |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
49 [1] |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
50 |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
51 $ hg resolve --list |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
52 U a |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
53 U b |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
54 |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
55 $ hg rebase --abort |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
56 rebase aborted |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
57 |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
58 Testing on-failure=prompt |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
59 $ echo on-failure=prompt >> $HGRCPATH |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
60 $ cat <<EOS | hg rebase -s 1 -d 2 --tool false --config ui.interactive=1 |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
61 > y |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
62 > n |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
63 > EOS |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
64 rebasing 1:1f28a51c3c9b "c" |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
65 merging a |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
66 merging b |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
67 merging a failed! |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
68 merging b failed! |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
69 unresolved conflicts (see hg resolve, then hg rebase --continue) |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
70 [1] |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
71 |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
72 $ hg resolve --list |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
73 U a |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
74 U b |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
75 |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
76 $ hg rebase --abort |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
77 rebase aborted |
143337bcec9b
merge: add tests to show current behavior on failed filemerges
Ryan McElroy <rmcelroy@fb.com>
parents:
diff
changeset
|
78 |