##// END OF EJS Templates
copies-tests: remove the final summary...
marmoute -
r44941:7f573563 default
parent child Browse files
Show More
@@ -297,52 +297,6 b' Note:'
297 | In this case, one of the merge wrongly record a merge while there is none.
297 | In this case, one of the merge wrongly record a merge while there is none.
298 | This lead to bad copy tracing information to be dug up.
298 | This lead to bad copy tracing information to be dug up.
299
299
300 final summary
301
302 $ hg update null --quiet
303 $ hg log -G
304 o 20 mEAm-0 simple merge - the other way]
305 |\
306 +---o 19 mAEm-0 simple merge - one way]
307 | |/
308 | o 18 e-2 g -move-> f]
309 | |
310 | o 17 e-1 b -move-> g]
311 | |
312 | | o 16 mDBm-0 simple merge - the other way]
313 | | |\
314 | | +---o 15 mBDm-0 simple merge - one way]
315 | | | |/
316 | | | o 14 d-2 re-add d]
317 | | | |
318 | +---o 13 d-1 delete d]
319 | | |
320 | | | o 12 mCBm-1 re-add d]
321 | | | |
322 | | | o 11 mCBm-0 simple merge - the other way]
323 | | |/|
324 | | | | o 10 mBCm-1 re-add d]
325 | | | | |
326 | | +---o 9 mBCm-0 simple merge - one way]
327 | | | |/
328 | +---o 8 c-1 delete d]
329 | | |
330 +-----o 7 mABm-0 simple merge - the other way]
331 | | |/
332 +-----o 6 mBAm-0 simple merge - one way]
333 | | |/
334 | | o 5 b-1: b update]
335 | |/
336 o | 4 a-2: e -move-> f]
337 | |
338 o | 3 a-1: d -move-> e]
339 |/
340 o 2 i-2: c -move-> d]
341 |
342 o 1 i-1: a -move-> c]
343 |
344 o 0 i-0 initial commit: a b]
345
346
300
347 Check results
301 Check results
348 =============
302 =============
General Comments 0
You need to be logged in to leave comments. Login now