equal
deleted
inserted
replaced
19 merging foo1 and foo to foo1 |
19 merging foo1 and foo to foo1 |
20 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
20 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
21 (branch merge, don't forget to commit) |
21 (branch merge, don't forget to commit) |
22 |
22 |
23 $ hg debugstate --nodates |
23 $ hg debugstate --nodates |
24 n 0 -2 bar |
24 m 0 -2 bar |
25 m 644 14 foo1 |
25 m 644 14 foo1 |
26 copy: foo -> foo1 |
26 copy: foo -> foo1 |
27 |
27 |
28 $ hg st -q |
28 $ hg st -q |
29 M bar |
29 M bar |
35 $ cp foo1 F |
35 $ cp foo1 F |
36 $ cp bar B |
36 $ cp bar B |
37 $ hg rm -f foo1 bar |
37 $ hg rm -f foo1 bar |
38 |
38 |
39 $ hg debugstate --nodates |
39 $ hg debugstate --nodates |
40 r 0 -2 bar |
40 r 0 -1 bar |
41 r 0 -1 foo1 |
41 r 0 -1 foo1 |
42 copy: foo -> foo1 |
42 copy: foo -> foo1 |
43 |
43 |
44 $ hg st -qC |
44 $ hg st -qC |
45 R bar |
45 R bar |
53 $ hg add -v foo1 bar |
53 $ hg add -v foo1 bar |
54 adding bar |
54 adding bar |
55 adding foo1 |
55 adding foo1 |
56 |
56 |
57 $ hg debugstate --nodates |
57 $ hg debugstate --nodates |
58 n 0 -2 bar |
58 m 644 5 bar |
59 m 644 14 foo1 |
59 m 644 14 foo1 |
60 copy: foo -> foo1 |
60 copy: foo -> foo1 |
61 |
61 |
62 $ hg st -qC |
62 $ hg st -qC |
63 M bar |
63 M bar |
72 reverting bar |
72 reverting bar |
73 saving current version of foo1 as foo1.orig |
73 saving current version of foo1 as foo1.orig |
74 reverting foo1 |
74 reverting foo1 |
75 |
75 |
76 $ hg debugstate --nodates |
76 $ hg debugstate --nodates |
77 n 0 -2 bar |
77 m 644 5 bar |
78 m 644 14 foo1 |
78 m 644 14 foo1 |
79 copy: foo -> foo1 |
79 copy: foo -> foo1 |
80 |
80 |
81 $ hg st -qC |
81 $ hg st -qC |
82 M bar |
82 M bar |