Patchwork D6254: tests: avoid a rename/delete conflict when updating in test-narrow-update.t

login
register
mail settings
Submitter phabricator
Date April 16, 2019, 5:18 p.m.
Message ID <differential-rev-PHID-DREV-7qrmtuz3mvdigsln2los-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/39653/
State Superseded
Headers show

Comments

phabricator - April 16, 2019, 5:18 p.m.
martinvonz created this revision.
Herald added a reviewer: durin42.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  After the upcoming rewrite of mergecopies(), this test would otherwise
  (accurately) start warning about "inside/f1 was deleted and renamed".

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  tests/test-narrow-update.t

CHANGE DETAILS




To: martinvonz, durin42, #hg-reviewers
Cc: mercurial-devel
phabricator - April 17, 2019, 8:37 p.m.
marmoute accepted this revision.
marmoute added a comment.


  This one seems simple and sensible.

REPOSITORY
  rHG Mercurial

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

To: martinvonz, durin42, #hg-reviewers, marmoute
Cc: marmoute, mercurial-devel

Patch

diff --git a/tests/test-narrow-update.t b/tests/test-narrow-update.t
--- a/tests/test-narrow-update.t
+++ b/tests/test-narrow-update.t
@@ -72,5 +72,5 @@ 
 
   $ hg mv inside/f1 inside/f2
   $ hg update -q 'desc("modify outside")'
-  $ hg update -q 'desc("initial")'
+  $ hg update -q 'desc("add inside and outside")'
   $ hg update -q 'desc("modify inside")'