Mercurial > hg-stable
changeset 42299:cbff7f996dc4
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 | 0ed293a3f00e |
| children | 651f325e4fdd |
| files | tests/test-copies.t |
| diffstat | 1 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-copies.t Wed May 01 20:54:27 2019 -0700 +++ b/tests/test-copies.t Tue May 14 09:46:38 2019 -0700 @@ -504,9 +504,9 @@ x -> z -Test for a case in fullcopytracing algorithm where both the merging csets are -"dirty"; where a dirty cset means that cset is descendant of merge base. This -test reflect that for this particular case this algorithm correctly find the copies: +Test for a case in fullcopytracing algorithm where neither of the merging csets +is a descendant of the merge base. This test reflects that the algorithm +correctly finds the copies: $ cat >> $HGRCPATH << EOF > [experimental] @@ -565,8 +565,8 @@ b +baba -Test to make sure that fullcopytracing algorithm don't fail when both the merging csets are dirty -(a dirty cset is one who is not the descendant of merge base) +Test to make sure that fullcopytracing algorithm doesn't fail when neither of the +merging csets is a descendant of the base. ------------------------------------------------------------------------------------------------- $ newrepo @@ -637,8 +637,8 @@ o 0 added a a -Now if we trigger a merge between cset revision 3 and 6 using base revision 4, in this case -both the merging csets will be dirty as no one is descendent of base revision: +Now if we trigger a merge between revision 3 and 6 using base revision 4, +neither of the merging csets will be a descendant of the base revision: $ hg graft -r 6 --base 4 --hidden -t :other grafting 6:99802e4f1e46 "added willconflict and d" (tip)