equal
deleted
inserted
replaced
16 $ hg commit -m a |
16 $ hg commit -m a |
17 |
17 |
18 Basic usage |
18 Basic usage |
19 |
19 |
20 $ hg log -G |
20 $ hg log -G |
21 @ 0:e93df3427f45 a |
21 @ 0:[0-9a-f]{12} a (re) |
22 |
22 |
23 $ hg touch . |
23 $ hg touch . |
24 $ hg log -G |
24 $ hg log -G |
25 @ 1:[0-9a-f]{12} a (re) |
25 @ 1:[0-9a-f]{12} a (re) |
26 |
26 |
48 $ hg log -G |
48 $ hg log -G |
49 @ 4:[0-9a-f]{12} a (re) |
49 @ 4:[0-9a-f]{12} a (re) |
50 |
50 |
51 o 3:[0-9a-f]{12} ab (re) |
51 o 3:[0-9a-f]{12} ab (re) |
52 |
52 |
53 $ hg prune 3 |
53 $ hg prune 4 |
|
54 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
55 working directory now at 000000000000 |
54 1 changesets pruned |
56 1 changesets pruned |
55 |
57 |
56 Duplicate |
58 Duplicate |
57 |
59 |
58 $ hg touch --duplicate . |
60 $ hg touch --duplicate . |
59 $ hg log -G |
61 $ hg log -G |
60 @ 5:[0-9a-f]{12} a (re) |
62 @ 5:[0-9a-f]{12} (re) |
61 |
63 |
62 o 4:[0-9a-f]{12} a (re) |
64 o 3:[0-9a-f]{12} ab (re) |
63 |
65 |
64 |
66 |
65 Multiple touch |
67 Multiple touch |
66 |
68 |
67 $ echo C > c |
69 $ echo C > c |
73 $ hg log -G |
75 $ hg log -G |
74 @ 7:[0-9a-f]{12} d (re) |
76 @ 7:[0-9a-f]{12} d (re) |
75 | |
77 | |
76 o 6:[0-9a-f]{12} c (re) |
78 o 6:[0-9a-f]{12} c (re) |
77 | |
79 | |
78 o 5:[0-9a-f]{12} a (re) |
80 o 5:[0-9a-f]{12} (re) |
79 |
81 |
80 o 4:[0-9a-f]{12} a (re) |
82 o 3:[0-9a-f]{12} ab (re) |
81 |
83 |
82 $ hg touch 6:7 |
84 $ hg touch .^:. |
83 $ hg log -G |
85 $ hg log -G |
84 @ 9:[0-9a-f]{12} d (re) |
86 @ 9:[0-9a-f]{12} d (re) |
85 | |
87 | |
86 o 8:[0-9a-f]{12} c (re) |
88 o 8:[0-9a-f]{12} c (re) |
87 | |
89 | |
88 o 5:[0-9a-f]{12} a (re) |
90 o 5:[0-9a-f]{12} (re) |
89 |
91 |
90 o 4:[0-9a-f]{12} a (re) |
92 o 3:[0-9a-f]{12} ab (re) |
91 |
93 |
92 |
94 |
93 check move data kept after rebase on touch: |
95 check move data kept after rebase on touch: |
94 |
96 |
95 $ touch gna1 |
97 $ touch gna1 |
105 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
107 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
106 |
108 |
107 $ hg touch |
109 $ hg touch |
108 1 new unstable changesets |
110 1 new unstable changesets |
109 |
111 |
|
112 $ hg log -G --hidden |
|
113 | o 10:[0-9a-f]{12} move (re) |
|
114 | |
|
115 | x 9:[0-9a-f]{12} gna1 (re) |
|
116 | | |
|
117 | x 6:[0-9a-f]{12} d (re) |
|
118 |/ |
|
119 | x 5:[0-9a-f]{12} c (re) |
|
120 | |
|
121 o 8:[0-9a-f]{12} c (re) |
|
122 | |
|
123 | x 7:[0-9a-f]{12} d (re) |
|
124 | | |
|
125 | x 6:[0-9a-f]{12} c (re) |
|
126 |/ |
|
127 o 5:[0-9a-f]{12} (re) |
|
128 |
|
129 x 4:[0-9a-f]{12} a (re) |
|
130 |
|
131 o 3:[0-9a-f]{12} ab (re) |
|
132 |
|
133 x 2:[0-9a-f]{12} temporary amend commit for [0-9a-f]{12} (re) |
|
134 | |
|
135 x 1:[0-9a-f]{12} a (re) |
|
136 |
|
137 x 0:[0-9a-f]{12} a (re) |
|
138 |
|
139 |
110 $ hg rebase -s 11 -d 12 |
140 $ hg rebase -s 11 -d 12 |
111 rebasing 11:* "move" (glob) |
141 rebasing 11:[0-9a-f]{12} "move" (re) |
112 $ hg st -C --change=tip |
142 $ hg st -C --change=tip |
113 A gna2 |
143 A gna2 |
114 gna1 |
144 gna1 |
115 R gna1 |
145 R gna1 |
116 |
146 |