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

login
register
mail settings
Submitter phabricator
Date April 17, 2019, 10:11 p.m.
Message ID <fbd6e8009dc9c2ed4062e4d7314256cb@localhost.localdomain>
Download mbox | patch
Permalink /patch/39717/
State Not Applicable
Headers show

Comments

phabricator - April 17, 2019, 10:11 p.m.
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




To: martinvonz, durin42, #hg-reviewers, marmoute, pulkit
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")'