Mercurial > public > mercurial-scm > hg-stable

annotate tests/test-merge-changedelete.t @ 27126:72b4e1bf8f28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-merge-changedelete.t: add resolve --list output We're going to move change/delete conflicts to the resolve phase, and the resolve --list output is one of the things that will be important to test.
author Siddharth Agarwal <sid0@fb.com>
date Mon, 23 Nov 2015 13:45:56 -0800
parents 969ca40cad1d
children 29b08ca680b0
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
12328
b63f6422d2a7 tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12259
diff changeset
1 Test for
b63f6422d2a7 tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12259
diff changeset
2 b5605d88dc27: Make ui.prompt repeat on "unrecognized response" again
b63f6422d2a7 tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12259
diff changeset
3 (issue897)
b63f6422d2a7 tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12259
diff changeset
4
b63f6422d2a7 tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12259
diff changeset
5 840e2b315c1f: Fix misleading error and prompts during update/merge
b63f6422d2a7 tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12259
diff changeset
6 (issue556)
12259
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
7
26895
fc41f9ffd4a4 test-merge-prompt.t: unset HGMERGE
Siddharth Agarwal <sid0@fb.com>
parents: 26850
diff changeset
8 Make sure HGMERGE doesn't interfere with the test
fc41f9ffd4a4 test-merge-prompt.t: unset HGMERGE
Siddharth Agarwal <sid0@fb.com>
parents: 26850
diff changeset
9 $ unset HGMERGE
fc41f9ffd4a4 test-merge-prompt.t: unset HGMERGE
Siddharth Agarwal <sid0@fb.com>
parents: 26850
diff changeset
10
12259
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
11 $ status() {
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
12 > echo "--- status ---"
27125
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
13 > hg st -A file1 file2 file3
27126
72b4e1bf8f28 test-merge-changedelete.t: add resolve --list output
Siddharth Agarwal <sid0@fb.com>
parents: 27125
diff changeset
14 > echo "--- resolve --list ---"
72b4e1bf8f28 test-merge-changedelete.t: add resolve --list output
Siddharth Agarwal <sid0@fb.com>
parents: 27125
diff changeset
15 > hg resolve --list file1 file2 file3
27125
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
16 > for file in file1 file2 file3; do
12259
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
17 > if [ -f $file ]; then
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
18 > echo "--- $file ---"
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
19 > cat $file
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
20 > else
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
21 > echo "*** $file does not exist"
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
22 > fi
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
23 > done
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
24 > }
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
25
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
26 $ hg init
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
27
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
28 $ echo 1 > file1
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
29 $ echo 2 > file2
27125
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
30 $ echo 3 > file3
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
31 $ hg ci -Am 'added files'
12259
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
32 adding file1
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
33 adding file2
27125
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
34 adding file3
12259
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
35
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
36 $ hg rm file1
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
37 $ echo changed >> file2
27125
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
38 $ echo changed1 >> file3
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
39 $ hg ci -m 'removed file1, changed file2, changed file3'
5672
8a65ea986755 Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
40
12259
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
41 $ hg co 0
27125
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
42 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
12259
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
43
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
44 $ echo changed >> file1
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
45 $ hg rm file2
27125
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
46 $ echo changed2 >> file3
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
47 $ hg ci -m 'changed file1, removed file2, changed file3'
12259
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
48 created new head
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
49
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
50
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
51 Non-interactive merge:
5672
8a65ea986755 Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
52
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12328
diff changeset
53 $ hg merge -y
18543
c8ba98bf0e71 merge: don't indent "local changed %s which remote deleted" prompt
Mads Kiilerich <madski@unity3d.com>
parents: 15521
diff changeset
54 local changed file1 which remote deleted
12259
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
55 use (c)hanged version or (d)elete? c
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
56 remote changed file2 which local deleted
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
57 use (c)hanged version or leave (d)eleted? c
27125
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
58 merging file3
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
59 warning: conflicts while merging file3! (edit, then use 'hg resolve --mark')
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
60 1 files updated, 0 files merged, 0 files removed, 1 files unresolved
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
61 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
62 [1]
5672
8a65ea986755 Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
63
12259
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
64 $ status
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
65 --- status ---
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
66 M file2
27125
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
67 M file3
12259
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
68 C file1
27126
72b4e1bf8f28 test-merge-changedelete.t: add resolve --list output
Siddharth Agarwal <sid0@fb.com>
parents: 27125
diff changeset
69 --- resolve --list ---
72b4e1bf8f28 test-merge-changedelete.t: add resolve --list output
Siddharth Agarwal <sid0@fb.com>
parents: 27125
diff changeset
70 U file3
12259
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
71 --- file1 ---
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
72 1
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
73 changed
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
74 --- file2 ---
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
75 2
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
76 changed
27125
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
77 --- file3 ---
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
78 3
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
79 <<<<<<< local: 13910f48cf7b - test: changed file1, removed file2, changed file3
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
80 changed2
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
81 =======
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
82 changed1
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
83 >>>>>>> other: 10f9a0a634e8 - test: removed file1, changed file2, changed file3
12259
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
84
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
85
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
86 Interactive merge:
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
87
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
88 $ hg co -C
27125
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
89 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
5672
8a65ea986755 Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
90
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12328
diff changeset
91 $ hg merge --config ui.interactive=true <<EOF
12259
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
92 > c
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
93 > d
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
94 > EOF
18543
c8ba98bf0e71 merge: don't indent "local changed %s which remote deleted" prompt
Mads Kiilerich <madski@unity3d.com>
parents: 15521
diff changeset
95 local changed file1 which remote deleted
22589
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 18543
diff changeset
96 use (c)hanged version or (d)elete? c
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 18543
diff changeset
97 remote changed file2 which local deleted
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 18543
diff changeset
98 use (c)hanged version or leave (d)eleted? d
27125
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
99 merging file3
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
100 warning: conflicts while merging file3! (edit, then use 'hg resolve --mark')
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
101 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
102 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
103 [1]
5672
8a65ea986755 Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
104
12259
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
105 $ status
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
106 --- status ---
15521
117f9190c1ba tests: hide 'No such file or directory' messages
Mads Kiilerich <mads@kiilerich.com>
parents: 12365
diff changeset
107 file2: * (glob)
27125
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
108 M file3
12259
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
109 C file1
27126
72b4e1bf8f28 test-merge-changedelete.t: add resolve --list output
Siddharth Agarwal <sid0@fb.com>
parents: 27125
diff changeset
110 --- resolve --list ---
72b4e1bf8f28 test-merge-changedelete.t: add resolve --list output
Siddharth Agarwal <sid0@fb.com>
parents: 27125
diff changeset
111 U file3
12259
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
112 --- file1 ---
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
113 1
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
114 changed
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
115 *** file2 does not exist
27125
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
116 --- file3 ---
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
117 3
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
118 <<<<<<< local: 13910f48cf7b - test: changed file1, removed file2, changed file3
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
119 changed2
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
120 =======
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
121 changed1
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
122 >>>>>>> other: 10f9a0a634e8 - test: removed file1, changed file2, changed file3
5672
8a65ea986755 Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
123
12259
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
124
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
125 Interactive merge with bad input:
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
126
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
127 $ hg co -C
27125
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
128 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5672
8a65ea986755 Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
129
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12328
diff changeset
130 $ hg merge --config ui.interactive=true <<EOF
12259
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
131 > foo
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
132 > bar
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
133 > d
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
134 > baz
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
135 > c
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
136 > EOF
18543
c8ba98bf0e71 merge: don't indent "local changed %s which remote deleted" prompt
Mads Kiilerich <madski@unity3d.com>
parents: 15521
diff changeset
137 local changed file1 which remote deleted
22589
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 18543
diff changeset
138 use (c)hanged version or (d)elete? foo
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 18543
diff changeset
139 unrecognized response
18543
c8ba98bf0e71 merge: don't indent "local changed %s which remote deleted" prompt
Mads Kiilerich <madski@unity3d.com>
parents: 15521
diff changeset
140 local changed file1 which remote deleted
22589
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 18543
diff changeset
141 use (c)hanged version or (d)elete? bar
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 18543
diff changeset
142 unrecognized response
18543
c8ba98bf0e71 merge: don't indent "local changed %s which remote deleted" prompt
Mads Kiilerich <madski@unity3d.com>
parents: 15521
diff changeset
143 local changed file1 which remote deleted
22589
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 18543
diff changeset
144 use (c)hanged version or (d)elete? d
12259
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
145 remote changed file2 which local deleted
22589
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 18543
diff changeset
146 use (c)hanged version or leave (d)eleted? baz
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 18543
diff changeset
147 unrecognized response
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 18543
diff changeset
148 remote changed file2 which local deleted
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 18543
diff changeset
149 use (c)hanged version or leave (d)eleted? c
27125
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
150 merging file3
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
151 warning: conflicts while merging file3! (edit, then use 'hg resolve --mark')
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
152 1 files updated, 0 files merged, 1 files removed, 1 files unresolved
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
153 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
154 [1]
5672
8a65ea986755 Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
155
12259
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
156 $ status
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
157 --- status ---
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
158 M file2
27125
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
159 M file3
12259
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
160 R file1
27126
72b4e1bf8f28 test-merge-changedelete.t: add resolve --list output
Siddharth Agarwal <sid0@fb.com>
parents: 27125
diff changeset
161 --- resolve --list ---
72b4e1bf8f28 test-merge-changedelete.t: add resolve --list output
Siddharth Agarwal <sid0@fb.com>
parents: 27125
diff changeset
162 U file3
12259
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
163 *** file1 does not exist
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
164 --- file2 ---
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
165 2
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
166 changed
27125
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
167 --- file3 ---
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
168 3
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
169 <<<<<<< local: 13910f48cf7b - test: changed file1, removed file2, changed file3
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
170 changed2
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
171 =======
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
172 changed1
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
173 >>>>>>> other: 10f9a0a634e8 - test: removed file1, changed file2, changed file3
12259
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
174
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
175
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
176 Interactive merge with not enough input:
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
177
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
178 $ hg co -C
27125
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
179 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
12259
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
180
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12328
diff changeset
181 $ hg merge --config ui.interactive=true <<EOF
12259
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
182 > d
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
183 > EOF
18543
c8ba98bf0e71 merge: don't indent "local changed %s which remote deleted" prompt
Mads Kiilerich <madski@unity3d.com>
parents: 15521
diff changeset
184 local changed file1 which remote deleted
22589
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 18543
diff changeset
185 use (c)hanged version or (d)elete? d
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 18543
diff changeset
186 remote changed file2 which local deleted
12259
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
187 use (c)hanged version or leave (d)eleted? abort: response expected
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12328
diff changeset
188 [255]
12259
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
189
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
190 $ status
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
191 --- status ---
15521
117f9190c1ba tests: hide 'No such file or directory' messages
Mads Kiilerich <mads@kiilerich.com>
parents: 12365
diff changeset
192 file2: * (glob)
12259
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
193 C file1
27125
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
194 C file3
27126
72b4e1bf8f28 test-merge-changedelete.t: add resolve --list output
Siddharth Agarwal <sid0@fb.com>
parents: 27125
diff changeset
195 --- resolve --list ---
12259
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
196 --- file1 ---
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
197 1
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
198 changed
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
199 *** file2 does not exist
27125
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
200 --- file3 ---
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
201 3
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
202 changed2
12259
7b05cb9ac6d2 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents: 5672
diff changeset
203
26850
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 22589
diff changeset
204 Non-interactive linear update
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 22589
diff changeset
205
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 22589
diff changeset
206 $ hg co -C 0
27125
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
207 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
26850
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 22589
diff changeset
208 $ echo changed >> file1
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 22589
diff changeset
209 $ hg rm file2
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 22589
diff changeset
210 $ hg update 1 -y
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 22589
diff changeset
211 local changed file1 which remote deleted
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 22589
diff changeset
212 use (c)hanged version or (d)elete? c
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 22589
diff changeset
213 remote changed file2 which local deleted
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 22589
diff changeset
214 use (c)hanged version or leave (d)eleted? c
27125
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
215 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
26850
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 22589
diff changeset
216 $ status
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 22589
diff changeset
217 --- status ---
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 22589
diff changeset
218 A file1
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 22589
diff changeset
219 C file2
27125
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
220 C file3
27126
72b4e1bf8f28 test-merge-changedelete.t: add resolve --list output
Siddharth Agarwal <sid0@fb.com>
parents: 27125
diff changeset
221 --- resolve --list ---
26850
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 22589
diff changeset
222 --- file1 ---
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 22589
diff changeset
223 1
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 22589
diff changeset
224 changed
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 22589
diff changeset
225 --- file2 ---
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 22589
diff changeset
226 2
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 22589
diff changeset
227 changed
27125
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
228 --- file3 ---
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
229 3
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents: 26947
diff changeset
230 changed1