Mercurial > hg
annotate tests/test-merge-prompt.t @ 15718:c604a3d1969d
icasefs: disuse length check against un-normcase()-ed filenames
this patch disuses length check against un-normcase()-ed filenames
gotten by "os.listdir()", because there is no assurance that
filesystem stores filenames normalized except in letter case, even
though some case insensitive filesystems (in some environment, for
some language setting) store them in such manner.
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Sat, 24 Dec 2011 00:50:56 +0900 |
parents | 117f9190c1ba |
children | c8ba98bf0e71 |
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 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
8 $ status() { |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
9 > echo "--- status ---" |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
10 > hg st -A file1 file2 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
11 > for file in file1 file2; do |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
12 > if [ -f $file ]; then |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
13 > echo "--- $file ---" |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
14 > cat $file |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
15 > else |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
16 > echo "*** $file does not exist" |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
17 > fi |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
18 > done |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
19 > } |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
20 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
21 $ hg init |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
22 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
23 $ echo 1 > file1 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
24 $ echo 2 > file2 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
25 $ hg ci -Am 'added file1 and file2' |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
26 adding file1 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
27 adding file2 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
28 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
29 $ hg rm file1 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
30 $ echo changed >> file2 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
31 $ hg ci -m 'removed file1, changed file2' |
5672
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
32 |
12259
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
33 $ hg co 0 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
34 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
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 $ echo changed >> file1 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
37 $ hg rm file2 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
38 $ hg ci -m 'changed file1, removed file2' |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
39 created new head |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
40 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
41 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
42 Non-interactive merge: |
5672
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
43 |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
44 $ hg merge -y |
12259
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
45 local changed file1 which remote deleted |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
46 use (c)hanged version or (d)elete? c |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
47 remote changed file2 which local deleted |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
48 use (c)hanged version or leave (d)eleted? c |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
49 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
50 (branch merge, don't forget to commit) |
5672
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
51 |
12259
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
52 $ status |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
53 --- status --- |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
54 M file2 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
55 C file1 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
56 --- file1 --- |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
57 1 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
58 changed |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
59 --- file2 --- |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
60 2 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
61 changed |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
62 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
63 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
64 Interactive merge: |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
65 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
66 $ hg co -C |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
67 0 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
|
68 |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
69 $ hg merge --config ui.interactive=true <<EOF |
12259
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
70 > c |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
71 > d |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
72 > EOF |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
73 local changed file1 which remote deleted |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
74 use (c)hanged version or (d)elete? remote changed file2 which local deleted |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
75 use (c)hanged version or leave (d)eleted? 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
76 (branch merge, don't forget to commit) |
5672
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
77 |
12259
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
78 $ status |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
79 --- status --- |
15521
117f9190c1ba
tests: hide 'No such file or directory' messages
Mads Kiilerich <mads@kiilerich.com>
parents:
12365
diff
changeset
|
80 file2: * (glob) |
12259
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
81 C file1 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
82 --- file1 --- |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
83 1 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
84 changed |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
85 *** file2 does not exist |
5672
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
86 |
12259
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 Interactive merge with bad input: |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
89 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
90 $ hg co -C |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
91 0 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
|
92 |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
93 $ hg merge --config ui.interactive=true <<EOF |
12259
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
94 > foo |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
95 > bar |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
96 > d |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
97 > baz |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
98 > c |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
99 > EOF |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
100 local changed file1 which remote deleted |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
101 use (c)hanged version or (d)elete? unrecognized response |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
102 local changed file1 which remote deleted |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
103 use (c)hanged version or (d)elete? unrecognized response |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
104 local changed file1 which remote deleted |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
105 use (c)hanged version or (d)elete? remote changed file2 which local deleted |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
106 use (c)hanged version or leave (d)eleted? unrecognized response |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
107 remote changed file2 which local deleted |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
108 use (c)hanged version or leave (d)eleted? 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
109 (branch merge, don't forget to commit) |
5672
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
110 |
12259
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
111 $ status |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
112 --- status --- |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
113 M file2 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
114 R file1 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
115 *** file1 does not exist |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
116 --- file2 --- |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
117 2 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
118 changed |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
119 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
120 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
121 Interactive merge with not enough input: |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
122 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
123 $ hg co -C |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
124 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
125 |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
126 $ hg merge --config ui.interactive=true <<EOF |
12259
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
127 > d |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
128 > EOF |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
129 local changed file1 which remote deleted |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
130 use (c)hanged version or (d)elete? remote changed file2 which local deleted |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
131 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
|
132 [255] |
12259
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
133 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
134 $ status |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
135 --- status --- |
15521
117f9190c1ba
tests: hide 'No such file or directory' messages
Mads Kiilerich <mads@kiilerich.com>
parents:
12365
diff
changeset
|
136 file2: * (glob) |
12259
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
137 C file1 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
138 --- file1 --- |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
139 1 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
140 changed |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
141 *** file2 does not exist |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
142 |