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

martinvonz (Martin von Zweigbergk) phabricator at mercurial-scm.org
Wed Apr 17 18:11:53 EDT 2019


This revision was automatically updated to reflect the committed changes.
Closed by commit rHG351cbda889db: tests: avoid a rename/delete conflict when updating in test-narrow-update.t (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6254?vs=14782&id=14817

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

AFFECTED FILES
  tests/test-narrow-update.t

CHANGE DETAILS

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")'



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


More information about the Mercurial-devel mailing list