Mercurial > hg

comparison tests/test-copies.t @ 42272:cbff7f996dc4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: avoid the word "dirty" to mean "not a descendant of merge base" The term "dirty" is no longer used in the code since 57203e0210f8 (copies: calculate mergecopies() based on pathcopies(), 2019-04-11). Differential Revision: https://phab.mercurial-scm.org/D6373
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 14 May 2019 09:46:38 -0700
parents 57203e0210f8
children f385ba70e4af
comparison
equal deleted inserted replaced
42271:0ed293a3f00e 42272:cbff7f996dc4
502 $ hg debugpathcopies 2 5 502 $ hg debugpathcopies 2 5
503 $ hg debugpathcopies 0 5 503 $ hg debugpathcopies 0 5
504 x -> z 504 x -> z
505 505
506 506
507 Test for a case in fullcopytracing algorithm where both the merging csets are 507 Test for a case in fullcopytracing algorithm where neither of the merging csets
508 "dirty"; where a dirty cset means that cset is descendant of merge base. This 508 is a descendant of the merge base. This test reflects that the algorithm
509 test reflect that for this particular case this algorithm correctly find the copies: 509 correctly finds the copies:
510 510
511 $ cat >> $HGRCPATH << EOF 511 $ cat >> $HGRCPATH << EOF
512 > [experimental] 512 > [experimental]
513 > evolution.createmarkers=True 513 > evolution.createmarkers=True
514 > evolution.allowunstable=True 514 > evolution.allowunstable=True
563 +++ b/b1 Thu Jan 01 00:00:00 1970 +0000 563 +++ b/b1 Thu Jan 01 00:00:00 1970 +0000
564 @@ -1,1 +1,2 @@ 564 @@ -1,1 +1,2 @@
565 b 565 b
566 +baba 566 +baba
567 567
568 Test to make sure that fullcopytracing algorithm don't fail when both the merging csets are dirty 568 Test to make sure that fullcopytracing algorithm doesn't fail when neither of the
569 (a dirty cset is one who is not the descendant of merge base) 569 merging csets is a descendant of the base.
570 ------------------------------------------------------------------------------------------------- 570 -------------------------------------------------------------------------------------------------
571 571
572 $ newrepo 572 $ newrepo
573 $ echo a > a 573 $ echo a > a
574 $ hg add a 574 $ hg add a
635 o 1 added b 635 o 1 added b
636 | b 636 | b
637 o 0 added a 637 o 0 added a
638 a 638 a
639 639
640 Now if we trigger a merge between cset revision 3 and 6 using base revision 4, in this case 640 Now if we trigger a merge between revision 3 and 6 using base revision 4,
641 both the merging csets will be dirty as no one is descendent of base revision: 641 neither of the merging csets will be a descendant of the base revision:
642 642
643 $ hg graft -r 6 --base 4 --hidden -t :other 643 $ hg graft -r 6 --base 4 --hidden -t :other
644 grafting 6:99802e4f1e46 "added willconflict and d" (tip) 644 grafting 6:99802e4f1e46 "added willconflict and d" (tip)