Show More
| @@ -1,52 +1,47 b'' | |||||
| 1 | $ "$TESTDIR/hghave" no-windows || exit 80 |
|
|||
| 2 |
|
||||
| 3 |
|
|
1 | $ hg init rep | |
| 4 | $ cd rep |
|
2 | $ cd rep | |
| 5 | $ mkdir dir |
|
3 | $ mkdir dir | |
| 6 | $ touch foo dir/bar |
|
4 | $ touch foo dir/bar | |
| 7 | $ hg -v addremove |
|
5 | $ hg -v addremove | |
| 8 | adding dir/bar |
|
6 | adding dir/bar | |
| 9 | adding foo |
|
7 | adding foo | |
| 10 | $ hg -v commit -m "add 1" |
|
8 | $ hg -v commit -m "add 1" | |
| 11 | dir/bar |
|
9 | dir/bar | |
| 12 | foo |
|
10 | foo | |
| 13 | committed changeset 0:6f7f953567a2 |
|
11 | committed changeset 0:6f7f953567a2 | |
| 14 | $ cd dir/ |
|
12 | $ cd dir/ | |
| 15 |
$ touch ../foo_2 bar_2 |
|
13 | $ touch ../foo_2 bar_2 | |
| 16 | $ hg -v addremove |
|
14 | $ hg -v addremove | |
| 17 | adding dir/bar_2 |
|
15 | adding dir/bar_2 | |
| 18 | adding dir/con.xml |
|
|||
| 19 | adding foo_2 |
|
16 | adding foo_2 | |
| 20 | warning: filename contains 'con', which is reserved on Windows: 'dir/con.xml' |
|
|||
| 21 |
$ |
|
17 | $ hg -v commit -m "add 2" | |
| 22 | dir/bar_2 |
|
18 | dir/bar_2 | |
| 23 | dir/con.xml |
|
|||
| 24 | foo_2 |
|
19 | foo_2 | |
| 25 |
committed changeset 1: |
|
20 | committed changeset 1:e65414bf35c5 | |
| 26 |
|
21 | |||
| 27 | $ cd .. |
|
22 | $ cd .. | |
| 28 | $ hg init sim |
|
23 | $ hg init sim | |
| 29 | $ cd sim |
|
24 | $ cd sim | |
| 30 | $ echo a > a |
|
25 | $ echo a > a | |
| 31 | $ echo a >> a |
|
26 | $ echo a >> a | |
| 32 | $ echo a >> a |
|
27 | $ echo a >> a | |
| 33 | $ echo c > c |
|
28 | $ echo c > c | |
| 34 | $ hg commit -Ama |
|
29 | $ hg commit -Ama | |
| 35 | adding a |
|
30 | adding a | |
| 36 | adding c |
|
31 | adding c | |
| 37 | $ mv a b |
|
32 | $ mv a b | |
| 38 | $ rm c |
|
33 | $ rm c | |
| 39 | $ echo d > d |
|
34 | $ echo d > d | |
| 40 | $ hg addremove -n -s 50 # issue 1696 |
|
35 | $ hg addremove -n -s 50 # issue 1696 | |
| 41 | removing a |
|
36 | removing a | |
| 42 | adding b |
|
37 | adding b | |
| 43 | removing c |
|
38 | removing c | |
| 44 | adding d |
|
39 | adding d | |
| 45 | recording removal of a as rename to b (100% similar) |
|
40 | recording removal of a as rename to b (100% similar) | |
| 46 | $ hg addremove -s 50 |
|
41 | $ hg addremove -s 50 | |
| 47 | removing a |
|
42 | removing a | |
| 48 | adding b |
|
43 | adding b | |
| 49 | removing c |
|
44 | removing c | |
| 50 | adding d |
|
45 | adding d | |
| 51 | recording removal of a as rename to b (100% similar) |
|
46 | recording removal of a as rename to b (100% similar) | |
| 52 | $ hg commit -mb |
|
47 | $ hg commit -mb | |
General Comments 0
You need to be logged in to leave comments.
Login now