##// END OF EJS Templates
tests: add test showing how `hg fix -s` deals with obsolete and orphan nodes...
Martin von Zweigbergk -
r46399:e281a1ac default draft
parent child Browse files
Show More
@@ -22,6 +22,7 b' relationships. We indicate fixed file co'
22 > [extensions]
22 > [extensions]
23 > fix =
23 > fix =
24 > strip =
24 > strip =
25 > debugdrawdag=$TESTDIR/drawdag.py
25 > [fix]
26 > [fix]
26 > uppercase-whole-file:command="$PYTHON" $UPPERCASEPY
27 > uppercase-whole-file:command="$PYTHON" $UPPERCASEPY
27 > uppercase-whole-file:pattern=set:**
28 > uppercase-whole-file:pattern=set:**
@@ -366,6 +367,40 b' Test passing multiple revisions to --sou'
366 XXXX
367 XXXX
367
368
368 $ cd ..
369 $ cd ..
370
371 $ hg init exclude-obsolete
372 $ cd exclude-obsolete
373 $ hg debugdrawdag <<'EOS'
374 > E C # prune: C
375 > | |
376 > D B # prune: B, D
377 > |/
378 > A
379 > EOS
380 1 new orphan changesets
381 $ hg log --graph --template '{rev} {desc}\n'
382 * 4 E
383 |
384 | x 3 C
385 | |
386 x | 2 D
387 | |
388 | x 1 B
389 |/
390 o 0 A
391
392 $ hg fix -s A
393 abort: fixing obsolete revision could cause divergence
394 [255]
395 $ hg fix -s B
396 abort: fixing obsolete revision could cause divergence
397 [255]
398 $ hg fix -s D
399 abort: fixing obsolete revision could cause divergence
400 [255]
401 $ hg fix -s E
402 $ cd ..
403
369 #endif
404 #endif
370
405
371 The --all flag should fix anything that wouldn't cause a problem if you fixed
406 The --all flag should fix anything that wouldn't cause a problem if you fixed
General Comments 0
You need to be logged in to leave comments. Login now