( )⚙ D8530 flags: also test merging a rename with and exec flag change

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8530

flags: also test merging a rename with and exec flag change
ClosedPublic

Authored by marmoute on May 16 2020, 4:11 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG9438c84d1dce: flags: also test merging a rename with and exec flag change
Summary

This case is currently buggy and was not tested. This is probably a quite old
regression. The next changeset fix this case. Move exec+rename related bug will
gain a test later.

To highlight the expected behavior the currently missing line are marked with (false !)
and the bad one with (true !)

note: we should probably gain explicit "test bool" for this usecases.

Diff Detail

Repository
rHG Mercurial
Branch
stable
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

PathPackages
Mtests/test-merge-exec.t (57 lines)

Diff 21394

tests/test-merge-exec.t

(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg st $ hg st
M a M a
$ [ -x a ] || echo "executable bit lost" $ [ -x a ] || echo "executable bit lost"
$ cd .. $ cd ..
Testing merging mode change with rename
=======================================
$ hg clone base-repo rename-merge-repo
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd rename-merge-repo
make "a" executable on one side
$ chmod +x a
$ hg status
M a
$ hg ci -m "make a executable"
$ [ -x a ] || echo "executable bit not recorded"
$ hg up ".^"
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
make "a" renamed on the other side
$ hg mv a z
$ hg st --copies
A z
a
R a
$ hg ci -m "rename a to z"
created new head
merge them (from the rename side)
$ hg merge 'desc("make a executable")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved (false !)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved (true !)
(branch merge, don't forget to commit)
$ hg st --copies
M z (false !)
a (false !)
$ [ -x z ] || echo "executable bit lost"
executable bit lost (true !)
merge them (from the chmod side)
$ hg up -C 'desc("make a executable")'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg merge 'desc("rename a to z")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved (false !)
1 files updated, 0 files merged, 1 files removed, 0 files unresolved (true !)
(branch merge, don't forget to commit)
$ hg st --copies
M z
a (false !)
R a
$ [ -x z ] || echo "executable bit lost"
executable bit lost (true !)
$ cd ..