# HG changeset patch # User Martin von Zweigbergk # Date 1555376694 25200 # Node ID 351cbda889dbb685fec341b22f51788712c64049 # Parent 344066b54a7b314bc3b5d08171e10d1da3374936 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 diff -r 344066b54a7b -r 351cbda889db 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")'