equal
deleted
inserted
replaced
8 |
8 |
9 $ chmod +x a |
9 $ chmod +x a |
10 $ hg ci -mexecutable |
10 $ hg ci -mexecutable |
11 |
11 |
12 $ hg up 0 |
12 $ hg up 0 |
13 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
13 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
14 $ rm a |
14 $ rm a |
15 $ ln -s symlink a |
15 $ ln -s symlink a |
16 $ hg ci -msymlink |
16 $ hg ci -msymlink |
17 created new head |
17 created new head |
18 |
18 |
23 ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c |
23 ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c |
24 conflicting flags for a |
24 conflicting flags for a |
25 (n)one, e(x)ec or sym(l)ink? n |
25 (n)one, e(x)ec or sym(l)ink? n |
26 a: update permissions -> e |
26 a: update permissions -> e |
27 updating: a 1/1 files (100.00%) |
27 updating: a 1/1 files (100.00%) |
28 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
28 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
29 (branch merge, don't forget to commit) |
29 (branch merge, don't forget to commit) |
30 |
30 |
31 |
31 |
32 Symlink is local parent, executable is other: |
32 Symlink is local parent, executable is other: |
33 |
33 |