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