This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8493

tests: show that `hg cp -A --at-rev .` doesn't work for renames
ClosedPublic

Authored by martinvonz on May 6 2020, 3:01 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGaf9970501021: tests: show that `hg cp -A --at-rev .` doesn't work for renames
rHG3a101007b86e: tests: show that `hg cp -A --at-rev .` doesn't work for renames
rHG5c49a4fdb238: tests: show that `hg cp -A --at-rev .` doesn't work for renames
Summary

I clearly forgot to implement (and test) support for marking of
renames when I added support for marking of copies :(

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.

Revision Contents
Changeset List

PathPackages
Mtests/test-rename-rev.t (20 lines)

Diff 21311

tests/test-rename-rev.t

saved backup bundle to $TESTTMP/.hg/strip-backup/8a9d70fa20c9-973ae357-copy.hg saved backup bundle to $TESTTMP/.hg/strip-backup/8a9d70fa20c9-973ae357-copy.hg
# New copy is recorded, and previously recorded copy is also still there # New copy is recorded, and previously recorded copy is also still there
$ hg st -C --change . $ hg st -C --change .
A d1/c A d1/c
d1/b d1/b
A d1/d A d1/d
d1/b d1/b
Test using directory as destination Test moved file (not copied)
$ hg co 0 $ hg co 0
0 files updated, 0 files merged, 2 files removed, 0 files unresolved 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ mv d1/b d1/d
$ hg rm -A d1/b
$ hg add d1/d
$ hg ci -m 'move d1/b to d1/d'
created new head
BROKEN: this should work
$ hg cp -A --at-rev . d1/b d1/d
d1/b: no such file in rev 519850c3ea27
abort: --at-rev requires a single source
[255]
$ hg st -C --change .
A d1/d
R d1/b
Test using directory as destination
$ hg co 0
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ cp -R d1 d3 $ cp -R d1 d3
$ hg add d3 $ hg add d3
adding d3/a adding d3/a
adding d3/b adding d3/b
adding d3/ba adding d3/ba
adding d3/d11/a1 adding d3/d11/a1
$ hg ci -m 'copy d1/ to d3/' $ hg ci -m 'copy d1/ to d3/'
created new head created new head
$ hg cp -A --at-rev . d1 d3 $ hg cp -A --at-rev . d1 d3
abort: d3: --at-rev does not support a directory as destination abort: d3: --at-rev does not support a directory as destination
[255] [255]