Patchwork D9589: copies-tests: update to null in test-copies-chain-merge.t

login
register
mail settings
Submitter phabricator
Date Dec. 14, 2020, 11:18 a.m.
Message ID <differential-rev-PHID-DREV-r5hcvb2ytkjbytracelf-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/47887/
State Superseded
Headers show

Comments

phabricator - Dec. 14, 2020, 11:18 a.m.
marmoute created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  This avoid some unrelated output changeset when adding more cases.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D9589

AFFECTED FILES
  tests/test-copies-chain-merge.t

CHANGE DETAILS




To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/tests/test-copies-chain-merge.t b/tests/test-copies-chain-merge.t
--- a/tests/test-copies-chain-merge.t
+++ b/tests/test-copies-chain-merge.t
@@ -637,6 +637,8 @@ 
 Summary of all created cases
 ----------------------------
 
+  $ hg up --quiet null
+
 (This exists to help keeping a compact list of the various cases we have built)
 
   $ hg log -T '{desc|firstline}\n'| sort
@@ -1706,7 +1708,7 @@ 
 (the copy information from the branch that was not deleted should win).
 
   $ hg log -G --rev '::(desc("mCH-delete-before-conflict-m")+desc("mHC-delete-before-conflict-m"))'
-  @    36 mHC-delete-before-conflict-m-0
+  o    36 mHC-delete-before-conflict-m-0
   |\
   +---o  35 mCH-delete-before-conflict-m-0
   | |/