171 +babar |
171 +babar |
172 discard change 3/3 to 'a'? |
172 discard change 3/3 to 'a'? |
173 (enter ? for help) [Ynesfdaq?] n |
173 (enter ? for help) [Ynesfdaq?] n |
174 |
174 |
175 |
175 |
|
176 $ hg debugobsolete |
|
177 e9635f4beaf11f64a07ccc74684092b144c53d89 0 {7733902a8d94c789ca81d866bea1893d79442db6} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'uncommit', 'user': 'test'} |
|
178 f70fb463d5bf9f0ffd38f105521d96e9f2591bc1 678a59e5ff90754d5e94719bd82ad169be773c21 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'note': 'note on amend --extract', 'operation': 'uncommit', 'user': 'test'} |
176 $ hg obslog |
179 $ hg obslog |
177 @ 678a59e5ff90 (3) another one |
180 @ 678a59e5ff90 (3) another one |
|
181 | amended(content) from f70fb463d5bf using uncommit by test (Thu Jan 01 00:00:00 1970 +0000) |
|
182 | note: note on amend --extract |
178 | |
183 | |
179 x f70fb463d5bf (1) another one |
184 x f70fb463d5bf (1) another one |
180 amended(content) as 678a59e5ff90 using uncommit by test (Thu Jan 01 00:00:00 1970 +0000) |
|
181 note: note on amend --extract |
|
182 |
185 |
183 The unselected part should be in the diff |
186 The unselected part should be in the diff |
184 ----------------------------------------- |
187 ----------------------------------------- |
185 |
188 |
186 $ hg diff |
189 $ hg diff |
306 4 |
309 4 |
307 5 |
310 5 |
308 |
311 |
309 Checking the obsolescence history |
312 Checking the obsolescence history |
310 |
313 |
|
314 $ hg debugobsolete |
|
315 e9635f4beaf11f64a07ccc74684092b144c53d89 0 {7733902a8d94c789ca81d866bea1893d79442db6} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'uncommit', 'user': 'test'} |
|
316 f70fb463d5bf9f0ffd38f105521d96e9f2591bc1 678a59e5ff90754d5e94719bd82ad169be773c21 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'note': 'note on amend --extract', 'operation': 'uncommit', 'user': 'test'} |
|
317 7ca9935a62f11b39b60c7fb8861377c7d45b3e99 0 {7733902a8d94c789ca81d866bea1893d79442db6} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'uncommit', 'user': 'test'} |
|
318 678a59e5ff90754d5e94719bd82ad169be773c21 46e35360be473bf761bedf3d05de4a68ffd9d9f8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'note': 'testing uncommit on dirty wdir', 'operation': 'uncommit', 'user': 'test'} |
311 $ hg obslog |
319 $ hg obslog |
312 @ 46e35360be47 (5) another one |
320 @ 46e35360be47 (5) another one |
|
321 | amended(content) from 678a59e5ff90 using uncommit by test (Thu Jan 01 00:00:00 1970 +0000) |
|
322 | note: testing uncommit on dirty wdir |
313 | |
323 | |
314 x 678a59e5ff90 (3) another one |
324 x 678a59e5ff90 (3) another one |
315 | amended(content) as 46e35360be47 using uncommit by test (Thu Jan 01 00:00:00 1970 +0000) |
325 | amended(content) from f70fb463d5bf using uncommit by test (Thu Jan 01 00:00:00 1970 +0000) |
316 | note: testing uncommit on dirty wdir |
326 | note: note on amend --extract |
317 | |
327 | |
318 x f70fb463d5bf (1) another one |
328 x f70fb463d5bf (1) another one |
319 amended(content) as 678a59e5ff90 using uncommit by test (Thu Jan 01 00:00:00 1970 +0000) |
|
320 note: note on amend --extract |
|
321 |
329 |
322 |
330 |
323 Push the changes back to the commit and more commits for more testing |
331 Push the changes back to the commit and more commits for more testing |
324 |
332 |
325 $ hg amend |
333 $ hg amend |