Mercurial > hg

comparison tests/test-conflict.t @ 21921:ecc1387138ba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: use non-minimal conflict marker regions (BC) As extensively detailed by Pierre-Yves[1], simplemerge's minimal markers can result in hopeless confusion for many common merges. As it happens, we accidentally inherited this behavior when we borrowed simplemerge from bzr; it is not the behavior used by RCS's merge(1), Since merge(1) (and not bzr) is what we aim to emulate when emulating RCS's merge markers, we simply turn this feature off. This brings us in line with the behavior of CVS, SVN, and Git as a bonus. (NB: using conflict markers with Mercurial is discouraged.) [1] http://markmail.org/message/wj5mh3lc46czlvld convert glob tessa
author Matt Mackall <mpm@selenic.com>
date Fri, 18 Jul 2014 21:49:52 -0500
parents 1d04d3fe616d
children 3d0572ab3b4a
comparison
equal deleted inserted replaced
21920:1d04d3fe616d 21921:ecc1387138ba
45 $ hg id 45 $ hg id
46 618808747361+c0c68e4fe667+ tip 46 618808747361+c0c68e4fe667+ tip
47 47
48 $ cat a 48 $ cat a
49 Small Mathematical Series. 49 Small Mathematical Series.
50 1
51 2
52 3
53 <<<<<<< local: 618808747361 - test: branch2 50 <<<<<<< local: 618808747361 - test: branch2
54 6 51 1
55 8 52 2
56 ======= 53 3
54 6
55 8
56 =======
57 1
58 2
59 3
57 4 60 4
58 5 61 5
59 >>>>>>> other: c0c68e4fe667 - test: branch1 62 >>>>>>> other: c0c68e4fe667 - test: branch1
60 Hop we are done. 63 Hop we are done.
61 64
76 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon 79 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
77 [1] 80 [1]
78 81
79 $ cat a 82 $ cat a
80 Small Mathematical Series. 83 Small Mathematical Series.
81 1
82 2
83 3
84 <<<<<<< local: test 2 84 <<<<<<< local: test 2
85 6 85 1
86 8 86 2
87 ======= 87 3
88 6
89 8
90 =======
91 1
92 2
93 3
88 4 94 4
89 5 95 5
90 >>>>>>> other: test 1 96 >>>>>>> other: test 1
91 Hop we are done. 97 Hop we are done.
92 98
103 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') 109 merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
104 [1] 110 [1]
105 111
106 $ cat a 112 $ cat a
107 Small Mathematical Series. 113 Small Mathematical Series.
108 1
109 2
110 3
111 <<<<<<< local: test 2 114 <<<<<<< local: test 2
112 6 115 1
113 8 116 2
114 ======= 117 3
118 6
119 8
120 =======
121 1
122 2
123 3
115 4 124 4
116 5 125 5
117 >>>>>>> other: test 1 126 >>>>>>> other: test 1
118 Hop we are done. 127 Hop we are done.
119 128
143 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') 152 merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
144 [1] 153 [1]
145 154
146 $ cat a 155 $ cat a
147 Small Mathematical Series. 156 Small Mathematical Series.
148 1
149 2
150 3
151 <<<<<<< local: 123456789012345678901234567890123456789012345678901234567890\xe3\x81\x82... (esc) 157 <<<<<<< local: 123456789012345678901234567890123456789012345678901234567890\xe3\x81\x82... (esc)
152 6 158 1
153 8 159 2
154 ======= 160 3
161 6
162 8
163 =======
164 1
165 2
166 3
155 4 167 4
156 5 168 5
157 >>>>>>> other: branch1 169 >>>>>>> other: branch1
158 Hop we are done. 170 Hop we are done.
159 171
170 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon 182 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
171 [1] 183 [1]
172 184
173 $ cat a 185 $ cat a
174 Small Mathematical Series. 186 Small Mathematical Series.
175 1
176 2
177 3
178 <<<<<<< local 187 <<<<<<< local
179 6 188 1
180 8 189 2
181 ======= 190 3
191 6
192 8
193 =======
194 1
195 2
196 3
182 4 197 4
183 5 198 5
184 >>>>>>> other 199 >>>>>>> other
185 Hop we are done. 200 Hop we are done.