Skip to content
Snippets Groups Projects
Commit 351cbda8 authored by Martin von Zweigbergk's avatar Martin von Zweigbergk
Browse files

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
parent 344066b5
No related branches found
No related tags found
No related merge requests found
......@@ -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")'
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment