Show More
@@ -2,19 +2,18 b'' | |||
|
2 | 2 | |
|
3 | 3 | hg init |
|
4 | 4 | echo a > a |
|
5 | hg ci -Amadd | |
|
5 | hg ci -Amadd # 0 | |
|
6 | 6 | |
|
7 | 7 | chmod +x a |
|
8 | hg ci -mexecutable | |
|
8 | hg ci -mexecutable # 1 | |
|
9 | 9 | |
|
10 | 10 | hg up 0 |
|
11 | 11 | rm a |
|
12 | 12 | ln -s symlink a |
|
13 | hg ci -msymlink | |
|
13 | hg ci -msymlink # 2 | |
|
14 | hg merge --debug | |
|
14 | 15 | |
|
15 | hg merge | |
|
16 | ||
|
17 | echo % symlink is left parent, executable is right | |
|
16 | echo % symlink is local parent, executable is other | |
|
18 | 17 | |
|
19 | 18 | if [ -h a ]; then |
|
20 | 19 | echo a is a symlink |
@@ -24,9 +23,9 b' elif [ -x a ]; then' | |||
|
24 | 23 | fi |
|
25 | 24 | |
|
26 | 25 | hg update -C 1 |
|
27 | hg merge | |
|
26 | hg merge --debug | |
|
28 | 27 | |
|
29 |
echo % symlink is |
|
|
28 | echo % symlink is other parent, executable is local | |
|
30 | 29 | |
|
31 | 30 | if [ -h a ]; then |
|
32 | 31 | echo a is a symlink |
General Comments 0
You need to be logged in to leave comments.
Login now