equal
deleted
inserted
replaced
4 $ hg init a |
4 $ hg init a |
5 $ cd a |
5 $ cd a |
6 |
6 |
7 $ echo foo > foo |
7 $ echo foo > foo |
8 $ hg ci -qAm0 |
8 $ hg ci -qAm0 |
9 $ chmod +x foo |
9 $ echo toremove > toremove |
10 $ hg ci -m1 |
10 $ echo todelete > todelete |
|
11 $ chmod +x foo toremove todelete |
|
12 $ hg ci -qAm1 |
|
13 |
|
14 Test that local removed/deleted, remote removed works with flags |
|
15 $ hg rm toremove |
|
16 $ rm todelete |
11 $ hg co -q 0 |
17 $ hg co -q 0 |
|
18 |
12 $ echo dirty > foo |
19 $ echo dirty > foo |
13 $ hg up -c |
20 $ hg up -c |
14 abort: uncommitted local changes |
21 abort: uncommitted local changes |
15 [255] |
22 [255] |
16 $ hg up -q |
23 $ hg up -q |
17 $ cat foo |
24 $ cat foo |
18 dirty |
25 dirty |
19 $ hg st -A |
26 $ hg st -A |
20 M foo |
27 M foo |
|
28 C todelete |
|
29 C toremove |
21 |
30 |
22 Validate update of standalone execute bit change: |
31 Validate update of standalone execute bit change: |
23 |
32 |
24 $ hg up -C 0 |
33 $ hg up -C 0 |
25 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
34 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
26 $ chmod -x foo |
35 $ chmod -x foo |
27 $ hg ci -m removeexec |
36 $ hg ci -m removeexec |
28 nothing changed |
37 nothing changed |
29 [1] |
38 [1] |
30 $ hg up -C 0 |
39 $ hg up -C 0 |
31 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
40 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
32 $ hg up |
41 $ hg up |
33 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
42 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
34 $ hg st |
43 $ hg st |
35 |
44 |
36 $ cd .. |
45 $ cd .. |