equal
deleted
inserted
replaced
16 adding foo_2 |
16 adding foo_2 |
17 $ hg -v commit -m "add 2" |
17 $ hg -v commit -m "add 2" |
18 dir/bar_2 |
18 dir/bar_2 |
19 foo_2 |
19 foo_2 |
20 committed changeset 1:e65414bf35c5 |
20 committed changeset 1:e65414bf35c5 |
21 $ cd ../.. |
21 $ cd .. |
|
22 $ hg forget foo |
|
23 $ hg -v addremove |
|
24 adding foo |
|
25 $ cd .. |
22 |
26 |
23 $ hg init sim |
27 $ hg init sim |
24 $ cd sim |
28 $ cd sim |
25 $ echo a > a |
29 $ echo a > a |
26 $ echo a >> a |
30 $ echo a >> a |
43 adding b |
47 adding b |
44 removing c |
48 removing c |
45 adding d |
49 adding d |
46 recording removal of a as rename to b (100% similar) |
50 recording removal of a as rename to b (100% similar) |
47 $ hg commit -mb |
51 $ hg commit -mb |
|
52 $ cp b c |
|
53 $ hg forget b |
|
54 $ hg addremove -s 50 |
|
55 adding b |
|
56 adding c |
48 $ cd .. |
57 $ cd .. |