This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8536

flags: also test merge with executable bit removed
ClosedPublic

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

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG6d968cd40961: flags: also test merge with executable bit removed
Summary

This might catch more bug in the future.

Diff Detail

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

Event Timeline

marmoute created this revision.May 16 2020, 4:12 PM
durin42 accepted this revision.May 18 2020, 1:01 PM
This revision is now accepted and ready to land.May 18 2020, 1:01 PM
marmoute added a commit: rHG6d968cd40961: flags: also test merge with executable bit removed.May 28 2020, 12:39 PM
Closed by commit rHG6d968cd40961: flags: also test merge with executable bit removed (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 21400

tests/test-merge-exec.t

$ cd .. $ cd ..
Removing the flag Removing the flag
----------------- -----------------
setup
Change on one side, executable bit on the other Change on one side, executable bit on the other
$ hg clone base-exec simple-merge-repo-removal $ hg clone base-exec simple-merge-repo-removal
updating to branch default updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd simple-merge-repo-removal $ cd simple-merge-repo-removal
$ chmod -x a $ chmod -x a
$ hg ci -m "make a non-executable, no change" $ hg ci -m "make a non-executable, no change"
[1] [1]
$ cd .. $ cd ..
Testing merging mode change with rename Testing merging mode change with rename
======================================= =======================================
Adding the flag
---------------
$ hg clone base-repo rename-merge-repo $ hg clone base-repo rename-merge-repo
updating to branch default updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd rename-merge-repo $ cd rename-merge-repo
make "a" executable on one side make "a" executable on one side
$ chmod +x a $ chmod +x a
M z M z
a a
R a R a
$ [ -x z ] || echo "executable bit lost" $ [ -x z ] || echo "executable bit lost"
$ cd .. $ cd ..
Removing the flag
-----------------
$ hg clone base-exec rename-merge-repo-removal
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd rename-merge-repo-removal
make "a" non-executable on one side
$ chmod -x a
$ hg status
M a
$ hg ci -m "make a non-executable"
$ [ -x a ] && echo "executable bit not removed"
[1]
$ 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 non-executable")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg st --copies
M z
a
$ [ -x z ] && echo "executable bit not removed"
[1]
merge them (from the chmod side)
$ hg up -C 'desc("make a non-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
(branch merge, don't forget to commit)
$ hg st --copies
M z
a
R a
$ [ -x z ] && echo "executable bit not removed"
[1]
$ cd ..
Testing merging mode change with rename + modification on both side Testing merging mode change with rename + modification on both side
=================================================================== ===================================================================
Adding the flag
---------------
$ hg clone base-repo rename+mod-merge-repo $ hg clone base-repo rename+mod-merge-repo
updating to branch default updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd rename+mod-merge-repo $ cd rename+mod-merge-repo
make "a" executable on one side make "a" executable on one side
$ chmod +x a $ chmod +x a
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg st --copies $ hg st --copies
M z M z
a a
R a R a
$ [ -x z ] || echo "executable bit lost" $ [ -x z ] || echo "executable bit lost"
$ cd .. $ cd ..
Removing the flag
-----------------
$ hg clone base-exec rename+mod-merge-repo-removal
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd rename+mod-merge-repo-removal
make "a" non-executable on one side
$ chmod -x a
$ cat << EOF > a
> 1
> x
> 3
> 4
> 5
> 6
> 7
> 8
> 9
> EOF
$ hg status
M a
$ hg ci -m "make a non-executable, and change start"
$ [ -x z ] && echo "executable bit not removed"
[1]
$ 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
$ cat << EOF > z
> 1
> 2
> 3
> 4
> 5
> 6
> 7
> x
> 9
> EOF
$ hg ci -m "rename a to z, and change end"
created new head
merge them (from the rename side)
$ hg merge 'desc("make a non-executable")'
merging z and a to z
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg st --copies
M z
a
$ [ -x z ] && echo "executable bit not removed"
[1]
merge them (from the chmod side)
$ hg up -C 'desc("make a non-executable")'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg merge 'desc("rename a to z")'
merging a and z to z
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg st --copies
M z
a
R a
$ [ -x z ] && echo "executable bit not removed"
[1]
$ cd ..