Mercurial > hg-stable

comparison tests/test-contrib.t @ 22023:f18830651811

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplemerge: burn "minimal" feature to the ground Matt Mackall said: The goal of simplemerge should have always been to be a drop-in replacement for RCS merge. Please nuke this minimization thing entirely. This whole things is now dead.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Tue, 05 Aug 2014 14:56:25 -0700
parents 94a22595f702
children 372ae2745acf
comparison
equal deleted inserted replaced
22022:2ea6d906cf9b 22023:f18830651811
141 $ cp base conflict-local 141 $ cp base conflict-local
142 $ cp other conflict-other 142 $ cp other conflict-other
143 $ echo not other >> conflict-local 143 $ echo not other >> conflict-local
144 $ echo end >> conflict-local 144 $ echo end >> conflict-local
145 $ echo end >> conflict-other 145 $ echo end >> conflict-other
146
146 $ python simplemerge -p conflict-local base conflict-other 147 $ python simplemerge -p conflict-local base conflict-other
147 base 148 base
148 <<<<<<< conflict-local 149 <<<<<<< conflict-local
149 not other 150 not other
150 =======
151 other
152 >>>>>>> conflict-other
153 end
154 warning: conflicts during merge.
155 [1]
156
157 --no-minimal
158
159 $ python simplemerge -p --no-minimal conflict-local base conflict-other
160 base
161 <<<<<<< conflict-local
162 not other
163 end 151 end
164 ======= 152 =======
165 other 153 other
166 end 154 end
167 >>>>>>> conflict-other 155 >>>>>>> conflict-other
172 160
173 $ python simplemerge -p -L foo conflict-local base conflict-other 161 $ python simplemerge -p -L foo conflict-local base conflict-other
174 base 162 base
175 <<<<<<< foo 163 <<<<<<< foo
176 not other 164 not other
165 end
177 ======= 166 =======
178 other 167 other
168 end
179 >>>>>>> conflict-other 169 >>>>>>> conflict-other
180 end
181 warning: conflicts during merge. 170 warning: conflicts during merge.
182 [1] 171 [1]
183 172
184 2 labels 173 2 labels
185 174
186 $ python simplemerge -p -L foo -L bar conflict-local base conflict-other 175 $ python simplemerge -p -L foo -L bar conflict-local base conflict-other
187 base 176 base
188 <<<<<<< foo 177 <<<<<<< foo
189 not other 178 not other
179 end
190 ======= 180 =======
191 other 181 other
182 end
192 >>>>>>> bar 183 >>>>>>> bar
193 end
194 warning: conflicts during merge. 184 warning: conflicts during merge.
195 [1] 185 [1]
196 186
197 too many labels 187 too many labels
198 188
229 219
230 options: 220 options:
231 -L --label labels to use on conflict markers 221 -L --label labels to use on conflict markers
232 -a --text treat all files as text 222 -a --text treat all files as text
233 -p --print print results instead of overwriting LOCAL 223 -p --print print results instead of overwriting LOCAL
234 --no-minimal do not try to minimize conflict regions 224 --no-minimal no effect (DEPRECATED)
235 -h --help display help and exit 225 -h --help display help and exit
236 -q --quiet suppress output 226 -q --quiet suppress output
237 227
238 wrong number of arguments 228 wrong number of arguments
239 229
249 239
250 options: 240 options:
251 -L --label labels to use on conflict markers 241 -L --label labels to use on conflict markers
252 -a --text treat all files as text 242 -a --text treat all files as text
253 -p --print print results instead of overwriting LOCAL 243 -p --print print results instead of overwriting LOCAL
254 --no-minimal do not try to minimize conflict regions 244 --no-minimal no effect (DEPRECATED)
255 -h --help display help and exit 245 -h --help display help and exit
256 -q --quiet suppress output 246 -q --quiet suppress output
257 [1] 247 [1]
258 248
259 bad option 249 bad option
270 260
271 options: 261 options:
272 -L --label labels to use on conflict markers 262 -L --label labels to use on conflict markers
273 -a --text treat all files as text 263 -a --text treat all files as text
274 -p --print print results instead of overwriting LOCAL 264 -p --print print results instead of overwriting LOCAL
275 --no-minimal do not try to minimize conflict regions 265 --no-minimal no effect (DEPRECATED)
276 -h --help display help and exit 266 -h --help display help and exit
277 -q --quiet suppress output 267 -q --quiet suppress output
278 [1] 268 [1]