This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6280

tests: avoid cryptic nodeids in tests/test-rename-merge1.t
ClosedPublic

Authored by martinvonz on Apr 19 2019, 1:28 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGfad480dad04d: tests: avoid cryptic nodeids in tests/test-rename-merge1.t
Summary

These two nodeids had not been part of any output before, so one can't
know which revision they refer to without adding something like `hg
log` before them. It turned out that '.^' was equivalent for both of
them, so that's what I replaced them with.

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 19 2019, 1:28 AM
pulkit accepted this revision.Apr 19 2019, 8:50 AM
Closed by commit rHGfad480dad04d: tests: avoid cryptic nodeids in tests/test-rename-merge1.t (authored by martinvonz). · Explain WhyApr 19 2019, 9:08 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-rename-merge1.t (4 lines)

Diff 14864

tests/test-rename-merge1.t

$ hg debugrename b $ hg debugrename b
b renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66 b renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66
This used to trigger a "divergent renames" warning, despite no renames This used to trigger a "divergent renames" warning, despite no renames
$ hg cp b b3 $ hg cp b b3
$ hg cp b b4 $ hg cp b b4
$ hg ci -A -m 'copy b twice' $ hg ci -A -m 'copy b twice'
$ hg up eb92d88a9712 $ hg up '.^'
0 files updated, 0 files merged, 2 files removed, 0 files unresolved 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ hg up $ hg up
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg rm b3 b4 $ hg rm b3 b4
$ hg ci -m 'clean up a bit of our mess' $ hg ci -m 'clean up a bit of our mess'
We'd rather not warn on divergent renames done in the same changeset (issue2113) We'd rather not warn on divergent renames done in the same changeset (issue2113)
$ hg cp b b3 $ hg cp b b3
$ hg mv b b4 $ hg mv b b4
$ hg ci -A -m 'divergent renames in same changeset' $ hg ci -A -m 'divergent renames in same changeset'
$ hg up c761c6948de0 $ hg up '.^'
1 files updated, 0 files merged, 2 files removed, 0 files unresolved 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ hg up $ hg up
2 files updated, 0 files merged, 1 files removed, 0 files unresolved 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
Check for issue2642 Check for issue2642
$ hg init t $ hg init t
$ cd t $ cd t