This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6254

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

Authored by martinvonz on Apr 16 2019, 1:16 PM.

Details

Reviewers
durin42
marmoute
pulkit
Group Reviewers
hg-reviewers
Commits
rHG351cbda889db: tests: avoid a rename/delete conflict when updating in test-narrow-update.t
Summary

After the upcoming rewrite of mergecopies(), this test would otherwise
(accurately) start warning about "inside/f1 was deleted and renamed".

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Apr 16 2019, 1:16 PM
marmoute accepted this revision.Apr 17 2019, 4:37 PM
marmoute added a subscriber: marmoute.

This one seems simple and sensible.

pulkit accepted this revision.Apr 17 2019, 5:20 PM
Closed by commit rHG351cbda889db: tests: avoid a rename/delete conflict when updating in test-narrow-update.t (authored by martinvonz). · Explain WhyApr 17 2019, 6:11 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-narrow-update.t (2 lines)

Diff 14817

tests/test-narrow-update.t

$ hg update -q 'desc("modify outside")' $ hg update -q 'desc("modify outside")'
$ hg update -q 'desc("initial")' $ hg update -q 'desc("initial")'
$ hg update -q 'desc("modify inside")' $ hg update -q 'desc("modify inside")'
Can update with a moved file inside Can update with a moved file inside
$ hg mv inside/f1 inside/f2 $ hg mv inside/f1 inside/f2
$ hg update -q 'desc("modify outside")' $ 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")' $ hg update -q 'desc("modify inside")'