tests: avoid a rename/delete conflict when updating in test-narrow-update.t
authorMartin von Zweigbergk <martinvonz@google.com>
Mon, 15 Apr 2019 18:04:54 -0700
changeset 42153 351cbda889db
parent 42152 344066b54a7b
child 42154 f2fe7cf4ebb6
tests: avoid a rename/delete conflict when updating in test-narrow-update.t After the upcoming rewrite of mergecopies(), this test would otherwise (accurately) start warning about "inside/f1 was deleted and renamed". Differential Revision: https://phab.mercurial-scm.org/D6254
tests/test-narrow-update.t
--- a/tests/test-narrow-update.t	Mon Apr 15 15:28:41 2019 -0700
+++ b/tests/test-narrow-update.t	Mon Apr 15 18:04:54 2019 -0700
@@ -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")'