##// END OF EJS Templates
tests: avoid the word "dirty" to mean "not a descendant of merge base"...
Martin von Zweigbergk -
r42458:cbff7f99 default
parent child Browse files
Show More
@@ -504,9 +504,9 b' Try merging the other direction too'
504 504 x -> z
505 505
506 506
507 Test for a case in fullcopytracing algorithm where both the merging csets are
508 "dirty"; where a dirty cset means that cset is descendant of merge base. This
509 test reflect that for this particular case this algorithm correctly find the copies:
507 Test for a case in fullcopytracing algorithm where neither of the merging csets
508 is a descendant of the merge base. This test reflects that the algorithm
509 correctly finds the copies:
510 510
511 511 $ cat >> $HGRCPATH << EOF
512 512 > [experimental]
@@ -565,8 +565,8 b' Grafting revision 4 on top of revision 2'
565 565 b
566 566 +baba
567 567
568 Test to make sure that fullcopytracing algorithm don't fail when both the merging csets are dirty
569 (a dirty cset is one who is not the descendant of merge base)
568 Test to make sure that fullcopytracing algorithm doesn't fail when neither of the
569 merging csets is a descendant of the base.
570 570 -------------------------------------------------------------------------------------------------
571 571
572 572 $ newrepo
@@ -637,8 +637,8 b' Test to make sure that fullcopytracing a'
637 637 o 0 added a
638 638 a
639 639
640 Now if we trigger a merge between cset revision 3 and 6 using base revision 4, in this case
641 both the merging csets will be dirty as no one is descendent of base revision:
640 Now if we trigger a merge between revision 3 and 6 using base revision 4,
641 neither of the merging csets will be a descendant of the base revision:
642 642
643 643 $ hg graft -r 6 --base 4 --hidden -t :other
644 644 grafting 6:99802e4f1e46 "added willconflict and d" (tip)
General Comments 0
You need to be logged in to leave comments. Login now