162 5 |
162 5 |
163 +babar |
163 +babar |
164 discard change 3/3 to 'a'? [Ynesfdaq?] n |
164 discard change 3/3 to 'a'? [Ynesfdaq?] n |
165 |
165 |
166 |
166 |
|
167 $ hg debugobsolete |
|
168 e9635f4beaf11f64a07ccc74684092b144c53d89 0 {7733902a8d94c789ca81d866bea1893d79442db6} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'uncommit', 'user': 'test'} |
|
169 f70fb463d5bf9f0ffd38f105521d96e9f2591bc1 678a59e5ff90754d5e94719bd82ad169be773c21 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'note': 'note on amend --extract', 'operation': 'uncommit', 'user': 'test'} |
167 $ hg obslog |
170 $ hg obslog |
168 @ 678a59e5ff90 (3) another one |
171 @ 678a59e5ff90 (3) another one |
|
172 | amended(content) from f70fb463d5bf using uncommit by test (Thu Jan 01 00:00:00 1970 +0000) |
|
173 | note: note on amend --extract |
169 | |
174 | |
170 x f70fb463d5bf (1) another one |
175 x f70fb463d5bf (1) another one |
171 amended(content) as 678a59e5ff90 using uncommit by test (Thu Jan 01 00:00:00 1970 +0000) |
|
172 note: note on amend --extract |
|
173 |
176 |
174 The unselected part should be in the diff |
177 The unselected part should be in the diff |
175 ----------------------------------------- |
178 ----------------------------------------- |
176 |
179 |
177 $ hg diff |
180 $ hg diff |
294 4 |
297 4 |
295 5 |
298 5 |
296 |
299 |
297 Checking the obsolescence history |
300 Checking the obsolescence history |
298 |
301 |
|
302 $ hg debugobsolete |
|
303 e9635f4beaf11f64a07ccc74684092b144c53d89 0 {7733902a8d94c789ca81d866bea1893d79442db6} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'uncommit', 'user': 'test'} |
|
304 f70fb463d5bf9f0ffd38f105521d96e9f2591bc1 678a59e5ff90754d5e94719bd82ad169be773c21 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'note': 'note on amend --extract', 'operation': 'uncommit', 'user': 'test'} |
|
305 7ca9935a62f11b39b60c7fb8861377c7d45b3e99 0 {7733902a8d94c789ca81d866bea1893d79442db6} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'uncommit', 'user': 'test'} |
|
306 678a59e5ff90754d5e94719bd82ad169be773c21 46e35360be473bf761bedf3d05de4a68ffd9d9f8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'note': 'testing uncommit on dirty wdir', 'operation': 'uncommit', 'user': 'test'} |
299 $ hg obslog |
307 $ hg obslog |
300 @ 46e35360be47 (5) another one |
308 @ 46e35360be47 (5) another one |
|
309 | amended(content) from 678a59e5ff90 using uncommit by test (Thu Jan 01 00:00:00 1970 +0000) |
|
310 | note: testing uncommit on dirty wdir |
301 | |
311 | |
302 x 678a59e5ff90 (3) another one |
312 x 678a59e5ff90 (3) another one |
303 | amended(content) as 46e35360be47 using uncommit by test (Thu Jan 01 00:00:00 1970 +0000) |
313 | amended(content) from f70fb463d5bf using uncommit by test (Thu Jan 01 00:00:00 1970 +0000) |
304 | note: testing uncommit on dirty wdir |
314 | note: note on amend --extract |
305 | |
315 | |
306 x f70fb463d5bf (1) another one |
316 x f70fb463d5bf (1) another one |
307 amended(content) as 678a59e5ff90 using uncommit by test (Thu Jan 01 00:00:00 1970 +0000) |
|
308 note: note on amend --extract |
|
309 |
317 |
310 |
318 |
311 Push the changes back to the commit and more commits for more testing |
319 Push the changes back to the commit and more commits for more testing |
312 |
320 |
313 $ hg amend |
321 $ hg amend |