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

2019-04-17 Thread martinvonz (Martin von Zweigbergk)
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

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

2019-04-17 Thread marmoute (Pierre-Yves David)
marmoute accepted this revision. marmoute added a comment. This one seems simple and sensible. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6254 To: martinvonz, durin42, #hg-reviewers, marmoute Cc: marmoute, mercurial-devel

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

2019-04-16 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a reviewer: durin42. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY After the upcoming rewrite of mergecopies(), this test would otherwise (accurately) start warning about "inside/f1 was