annotate tests/test-merge-local.t @ 52048:78fc666a3e94

rust-files: check for empty manifests caused by narrow Explanations inline
author Raphaël Gomès <rgomes@octobus.net>
date Wed, 02 Oct 2024 13:39:43 +0200
parents 55c6ebd11cb9
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
49621
55c6ebd11cb9 tests: run many tests in $TESTTMP/repo instead of $TESTTMP
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents: 34146
diff changeset
1 $ hg init repo
55c6ebd11cb9 tests: run many tests in $TESTTMP/repo instead of $TESTTMP
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents: 34146
diff changeset
2 $ cd repo
12258
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
3
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
4 Revision 0:
3869
ad6f34c83c3d Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
5
12258
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
6 $ echo "unchanged" > unchanged
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
7 $ echo "remove me" > remove
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
8 $ echo "copy me" > copy
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
9 $ echo "move me" > move
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
10 $ for i in 1 2 3 4 5 6 7 8 9; do
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
11 > echo "merge ok $i" >> zzz1_merge_ok
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
12 > done
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
13 $ echo "merge bad" > zzz2_merge_bad
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
14 $ hg ci -Am "revision 0"
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
15 adding copy
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
16 adding move
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
17 adding remove
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
18 adding unchanged
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
19 adding zzz1_merge_ok
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
20 adding zzz2_merge_bad
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
21
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
22 Revision 1:
3869
ad6f34c83c3d Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
23
12258
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
24 $ hg rm remove
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
25 $ hg mv move moved
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
26 $ hg cp copy copied
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
27 $ echo "added" > added
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
28 $ hg add added
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
29 $ echo "new first line" > zzz1_merge_ok
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
30 $ hg cat zzz1_merge_ok >> zzz1_merge_ok
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
31 $ echo "new last line" >> zzz2_merge_bad
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
32 $ hg ci -m "revision 1"
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
33
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
34 Local changes to revision 0:
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
35
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
36 $ hg co 0
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
37 4 files updated, 0 files merged, 3 files removed, 0 files unresolved
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
38 $ echo "new last line" >> zzz1_merge_ok
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
39 $ echo "another last line" >> zzz2_merge_bad
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
40
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
41 $ hg diff --nodates | grep "^[+-][^<>]"
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
42 --- a/zzz1_merge_ok
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
43 +++ b/zzz1_merge_ok
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
44 +new last line
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
45 --- a/zzz2_merge_bad
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
46 +++ b/zzz2_merge_bad
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
47 +another last line
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
48
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
49 $ hg st
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
50 M zzz1_merge_ok
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
51 M zzz2_merge_bad
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
52
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
53 Local merge with bad merge tool:
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
54
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
55 $ HGMERGE=false hg co
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
56 merging zzz1_merge_ok
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
57 merging zzz2_merge_bad
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
58 merging zzz2_merge_bad failed!
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
59 3 files updated, 1 files merged, 2 files removed, 1 files unresolved
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
60 use 'hg resolve' to retry unresolved file merges
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12258
diff changeset
61 [1]
3869
ad6f34c83c3d Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
62
27316
777f668eca70 merge: refuse update/merge if there are unresolved conflicts (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents: 26941
diff changeset
63 $ hg resolve -m
777f668eca70 merge: refuse update/merge if there are unresolved conflicts (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents: 26941
diff changeset
64 (no more unresolved files)
777f668eca70 merge: refuse update/merge if there are unresolved conflicts (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents: 26941
diff changeset
65
12258
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
66 $ hg co 0
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
67 merging zzz1_merge_ok
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
68 merging zzz2_merge_bad
26614
ef1eb6df7071 simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents: 15501
diff changeset
69 warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark')
30229
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30200
diff changeset
70 2 files updated, 1 files merged, 3 files removed, 1 files unresolved
12258
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
71 use 'hg resolve' to retry unresolved file merges
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12258
diff changeset
72 [1]
3869
ad6f34c83c3d Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
73
12258
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
74 $ hg diff --nodates | grep "^[+-][^<>]"
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
75 --- a/zzz1_merge_ok
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
76 +++ b/zzz1_merge_ok
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
77 +new last line
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
78 --- a/zzz2_merge_bad
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
79 +++ b/zzz2_merge_bad
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
80 +another last line
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
81 +=======
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
82
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
83 $ hg st
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
84 M zzz1_merge_ok
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
85 M zzz2_merge_bad
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
86 ? zzz2_merge_bad.orig
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
87
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
88 Local merge with conflicts:
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
89
27316
777f668eca70 merge: refuse update/merge if there are unresolved conflicts (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents: 26941
diff changeset
90 $ hg resolve -m
777f668eca70 merge: refuse update/merge if there are unresolved conflicts (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents: 26941
diff changeset
91 (no more unresolved files)
777f668eca70 merge: refuse update/merge if there are unresolved conflicts (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents: 26941
diff changeset
92
12258
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
93 $ hg co
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
94 merging zzz1_merge_ok
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
95 merging zzz2_merge_bad
26614
ef1eb6df7071 simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents: 15501
diff changeset
96 warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark')
12258
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
97 3 files updated, 1 files merged, 2 files removed, 1 files unresolved
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
98 use 'hg resolve' to retry unresolved file merges
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12258
diff changeset
99 [1]
3869
ad6f34c83c3d Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
100
27316
777f668eca70 merge: refuse update/merge if there are unresolved conflicts (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents: 26941
diff changeset
101 $ hg resolve -m
777f668eca70 merge: refuse update/merge if there are unresolved conflicts (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents: 26941
diff changeset
102 (no more unresolved files)
777f668eca70 merge: refuse update/merge if there are unresolved conflicts (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents: 26941
diff changeset
103
26941
454deda24315 filemerge: choose where .orig files are kept
Christian Delahousse <cdelahousse@fb.com>
parents: 26614
diff changeset
104 $ hg co 0 --config 'ui.origbackuppath=.hg/origbackups'
12258
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
105 merging zzz1_merge_ok
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
106 merging zzz2_merge_bad
26614
ef1eb6df7071 simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents: 15501
diff changeset
107 warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark')
30229
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30200
diff changeset
108 2 files updated, 1 files merged, 3 files removed, 1 files unresolved
12258
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
109 use 'hg resolve' to retry unresolved file merges
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12258
diff changeset
110 [1]
12258
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
111
26941
454deda24315 filemerge: choose where .orig files are kept
Christian Delahousse <cdelahousse@fb.com>
parents: 26614
diff changeset
112 Are orig files from the last commit where we want them?
454deda24315 filemerge: choose where .orig files are kept
Christian Delahousse <cdelahousse@fb.com>
parents: 26614
diff changeset
113 $ ls .hg/origbackups
34146
9e4f82bc2b0b scmutil: don't append .orig to backups in origbackuppath (BC)
Mark Thomas <mbthomas@fb.com>
parents: 30229
diff changeset
114 zzz2_merge_bad
26941
454deda24315 filemerge: choose where .orig files are kept
Christian Delahousse <cdelahousse@fb.com>
parents: 26614
diff changeset
115
12258
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
116 $ hg diff --nodates | grep "^[+-][^<>]"
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
117 --- a/zzz1_merge_ok
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
118 +++ b/zzz1_merge_ok
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
119 +new last line
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
120 --- a/zzz2_merge_bad
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
121 +++ b/zzz2_merge_bad
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
122 +another last line
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
123 +=======
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
124 +=======
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
125 +new last line
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
126 +=======
3869
ad6f34c83c3d Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
127
12258
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
128 $ hg st
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
129 M zzz1_merge_ok
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
130 M zzz2_merge_bad
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
131 ? zzz2_merge_bad.orig
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
132
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
133 Local merge without conflicts:
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
134
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
135 $ hg revert zzz2_merge_bad
3869
ad6f34c83c3d Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
136
27316
777f668eca70 merge: refuse update/merge if there are unresolved conflicts (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents: 26941
diff changeset
137 $ hg resolve -m
777f668eca70 merge: refuse update/merge if there are unresolved conflicts (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents: 26941
diff changeset
138 (no more unresolved files)
777f668eca70 merge: refuse update/merge if there are unresolved conflicts (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents: 26941
diff changeset
139
12258
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
140 $ hg co
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
141 merging zzz1_merge_ok
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
142 4 files updated, 1 files merged, 2 files removed, 0 files unresolved
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
143
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
144 $ hg diff --nodates | grep "^[+-][^<>]"
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
145 --- a/zzz1_merge_ok
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
146 +++ b/zzz1_merge_ok
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
147 +new last line
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
148
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
149 $ hg st
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
150 M zzz1_merge_ok
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
151 ? zzz2_merge_bad.orig
98ec977aa61e tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
152