| changeset 35200 | 9e339c97fabb |
| parent 35195 | 900ed9853017 |
| child 35435 | f01101100043 |
| 35199:80bb15769c73 | 35200:9e339c97fabb |
|---|---|
81 | |
81 | |
82 o 0:18d04c59bb5d Added a |
82 o 0:18d04c59bb5d Added a |
83 |
83 |
84 $ hg unamend |
84 $ hg unamend |
85 $ hg glog --hidden |
85 $ hg glog --hidden |
86 @ 9:8da14a1fd653 Added h |
86 @ 9:46d02d47eec6 Added h |
87 | |
87 | |
88 | x 8:c9fa1a715c1b Added h |
88 | x 8:c9fa1a715c1b Added h |
89 |/ |
89 |/ |
90 | x 7:ec2426147f0e Added h |
90 | x 7:ec2426147f0e Added h |
91 |/ |
91 |/ |
102 o 1:29becc82797a Added b |
102 o 1:29becc82797a Added b |
103 | |
103 | |
104 o 0:18d04c59bb5d Added a |
104 o 0:18d04c59bb5d Added a |
105 |
105 |
106 $ hg diff |
106 $ hg diff |
107 diff -r 8da14a1fd653 h |
107 diff -r 46d02d47eec6 h |
108 --- a/h Thu Jan 01 00:00:00 1970 +0000 |
108 --- a/h Thu Jan 01 00:00:00 1970 +0000 |
109 +++ b/h Thu Jan 01 00:00:00 1970 +0000 |
109 +++ b/h Thu Jan 01 00:00:00 1970 +0000 |
110 @@ -1,1 +1,2 @@ |
110 @@ -1,1 +1,2 @@ |
111 foo |
111 foo |
112 +bar |
112 +bar |
114 $ hg exp |
114 $ hg exp |
115 # HG changeset patch |
115 # HG changeset patch |
116 # User test |
116 # User test |
117 # Date 0 0 |
117 # Date 0 0 |
118 # Thu Jan 01 00:00:00 1970 +0000 |
118 # Thu Jan 01 00:00:00 1970 +0000 |
119 # Node ID 8da14a1fd653c3f07fdad5760511c9e12652a306 |
119 # Node ID 46d02d47eec6ca096b8dcab3f8f5579c40c3dd9a |
120 # Parent 87d6d66763085b629e6d7ed56778c79827273022 |
120 # Parent 87d6d66763085b629e6d7ed56778c79827273022 |
121 Added h |
121 Added h |
122 |
122 |
123 diff -r 87d6d6676308 -r 8da14a1fd653 h |
123 diff -r 87d6d6676308 -r 46d02d47eec6 h |
124 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
124 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
125 +++ b/h Thu Jan 01 00:00:00 1970 +0000 |
125 +++ b/h Thu Jan 01 00:00:00 1970 +0000 |
126 @@ -0,0 +1,1 @@ |
126 @@ -0,0 +1,1 @@ |
127 +foo |
127 +foo |
128 |
128 |
129 $ hg status |
129 $ hg status |
130 M h |
130 M h |
131 |
131 |
132 $ hg log -r . -T '{extras % "{extra}\n"}' --config alias.log=log |
132 $ hg log -r . -T '{extras % "{extra}\n"}' --config alias.log=log |
133 branch=default |
133 branch=default |
134 unamend_source=\xc9\xfa\x1aq\\\x1bva\xc0\xfa\xfb6*\x9f0\xbdu\x87\x8d} |
134 unamend_source=c9fa1a715c1b7661c0fafb362a9f30bd75878d7d |
135 |
135 |
136 Using unamend to undo an unamed (intentional) |
136 Using unamend to undo an unamed (intentional) |
137 |
137 |
138 $ hg unamend |
138 $ hg unamend |
139 $ hg exp |
139 $ hg exp |
140 # HG changeset patch |
140 # HG changeset patch |
141 # User test |
141 # User test |
142 # Date 0 0 |
142 # Date 0 0 |
143 # Thu Jan 01 00:00:00 1970 +0000 |
143 # Thu Jan 01 00:00:00 1970 +0000 |
144 # Node ID 1c09887216571a9755fc9d2e7f0e41c2b49e341b |
144 # Node ID 850ddfc1bc662997ec6094ada958f01f0cc8070a |
145 # Parent 87d6d66763085b629e6d7ed56778c79827273022 |
145 # Parent 87d6d66763085b629e6d7ed56778c79827273022 |
146 Added h |
146 Added h |
147 |
147 |
148 diff -r 87d6d6676308 -r 1c0988721657 h |
148 diff -r 87d6d6676308 -r 850ddfc1bc66 h |
149 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
149 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
150 +++ b/h Thu Jan 01 00:00:00 1970 +0000 |
150 +++ b/h Thu Jan 01 00:00:00 1970 +0000 |
151 @@ -0,0 +1,2 @@ |
151 @@ -0,0 +1,2 @@ |
152 +foo |
152 +foo |
153 +bar |
153 +bar |
168 $ hg status |
168 $ hg status |
169 M a |
169 M a |
170 M b |
170 M b |
171 |
171 |
172 $ hg diff |
172 $ hg diff |
173 diff -r 956548224719 a |
173 diff -r ec338db45d51 a |
174 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
174 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
175 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
175 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
176 @@ -1,1 +1,3 @@ |
176 @@ -1,1 +1,3 @@ |
177 foo |
177 foo |
178 +bar |
178 +bar |
179 +foobar |
179 +foobar |
180 diff -r 956548224719 b |
180 diff -r ec338db45d51 b |
181 --- a/b Thu Jan 01 00:00:00 1970 +0000 |
181 --- a/b Thu Jan 01 00:00:00 1970 +0000 |
182 +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
182 +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
183 @@ -1,1 +1,2 @@ |
183 @@ -1,1 +1,2 @@ |
184 foo |
184 foo |
185 +bar |
185 +bar |
221 |
221 |
222 $ hg unamend |
222 $ hg unamend |
223 $ hg status |
223 $ hg status |
224 A bar |
224 A bar |
225 $ hg diff |
225 $ hg diff |
226 diff -r ff917aa01c86 bar |
226 diff -r 7f79409af972 bar |
227 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
227 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
228 +++ b/bar Thu Jan 01 00:00:00 1970 +0000 |
228 +++ b/bar Thu Jan 01 00:00:00 1970 +0000 |
229 @@ -0,0 +1,2 @@ |
229 @@ -0,0 +1,2 @@ |
230 +foo |
230 +foo |
231 +bar |
231 +bar |
234 forgetting bar |
234 forgetting bar |
235 |
235 |
236 Unamending in middle of a stack |
236 Unamending in middle of a stack |
237 |
237 |
238 $ hg glog |
238 $ hg glog |
239 @ 19:ff917aa01c86 Added things to a and b |
239 @ 19:7f79409af972 Added things to a and b |
240 | |
240 | |
241 o 12:956548224719 Added h |
241 o 12:ec338db45d51 Added h |
242 | |
242 | |
243 o 6:87d6d6676308 Added g |
243 o 6:87d6d6676308 Added g |
244 | |
244 | |
245 o 5:825660c69f0c Added f |
245 o 5:825660c69f0c Added f |
246 | |
246 | |
259 $ echo bar >> f |
259 $ echo bar >> f |
260 $ hg amend |
260 $ hg amend |
261 $ hg rebase -s 6 -d . -q |
261 $ hg rebase -s 6 -d . -q |
262 |
262 |
263 $ hg glog |
263 $ hg glog |
264 o 23:2b41b42e192a Added things to a and b |
264 o 23:03ddd6fc5af1 Added things to a and b |
265 | |
265 | |
266 o 22:1860df151f01 Added h |
266 o 22:3e7b64ee157b Added h |
267 | |
267 | |
268 o 21:49635b68477e Added g |
268 o 21:49635b68477e Added g |
269 | |
269 | |
270 @ 20:93f0e8ffab32 Added f |
270 @ 20:93f0e8ffab32 Added f |
271 | |
271 | |
304 $ hg exp --git |
304 $ hg exp --git |
305 # HG changeset patch |
305 # HG changeset patch |
306 # User test |
306 # User test |
307 # Date 0 0 |
307 # Date 0 0 |
308 # Thu Jan 01 00:00:00 1970 +0000 |
308 # Thu Jan 01 00:00:00 1970 +0000 |
309 # Node ID b087c66cada118d6c5487d3d7cb29cac239bd98a |
309 # Node ID cfef290346fbee5126313d7e1aab51d877679b09 |
310 # Parent 2b41b42e192adc425b106643c3fc89170d6b8add |
310 # Parent 03ddd6fc5af19e028c44a2fd6d790dd22712f231 |
311 Moved a to foo |
311 Moved a to foo |
312 |
312 |
313 diff --git a/a b/foo |
313 diff --git a/a b/foo |
314 rename from a |
314 rename from a |
315 rename to foo |
315 rename to foo |
324 $ hg exp --git |
324 $ hg exp --git |
325 # HG changeset patch |
325 # HG changeset patch |
326 # User test |
326 # User test |
327 # Date 0 0 |
327 # Date 0 0 |
328 # Thu Jan 01 00:00:00 1970 +0000 |
328 # Thu Jan 01 00:00:00 1970 +0000 |
329 # Node ID 9fa06fb09a83a86ec7368d15004dbc52ac1a5d2e |
329 # Node ID eca050985275bb271ce3092b54e56ea5c85d29a3 |
330 # Parent 2b41b42e192adc425b106643c3fc89170d6b8add |
330 # Parent 03ddd6fc5af19e028c44a2fd6d790dd22712f231 |
331 Moved a to foo |
331 Moved a to foo |
332 |
332 |
333 diff --git a/a b/foo |
333 diff --git a/a b/foo |
334 rename from a |
334 rename from a |
335 rename to foo |
335 rename to foo |
345 $ hg exp --git |
345 $ hg exp --git |
346 # HG changeset patch |
346 # HG changeset patch |
347 # User test |
347 # User test |
348 # Date 0 0 |
348 # Date 0 0 |
349 # Thu Jan 01 00:00:00 1970 +0000 |
349 # Thu Jan 01 00:00:00 1970 +0000 |
350 # Node ID 4cf9987c9b941f615930e7c46307b4dbf35697cf |
350 # Node ID 552e3af4f01f620f88ca27be1f898316235b736a |
351 # Parent 2b41b42e192adc425b106643c3fc89170d6b8add |
351 # Parent 03ddd6fc5af19e028c44a2fd6d790dd22712f231 |
352 Moved a to foo |
352 Moved a to foo |
353 |
353 |
354 diff --git a/a b/foo |
354 diff --git a/a b/foo |
355 rename from a |
355 rename from a |
356 rename to foo |
356 rename to foo |