equal
deleted
inserted
replaced
132 > y |
132 > y |
133 > y |
133 > y |
134 > n |
134 > n |
135 > n |
135 > n |
136 > EOF |
136 > EOF |
|
137 current hg version does not support storing note in obsmarker |
|
138 current hg version does not support storing note in obsmarker |
137 diff --git a/a b/a |
139 diff --git a/a b/a |
138 3 hunks, 6 lines changed |
140 3 hunks, 6 lines changed |
139 examine changes to 'a'? [Ynesfdaq?] y |
141 examine changes to 'a'? [Ynesfdaq?] y |
140 |
142 |
141 @@ -1,3 +1,6 @@ |
143 @@ -1,3 +1,6 @@ |
231 $ hg uncommit -n "testing uncommit on dirty wdir" -i<<EOF |
233 $ hg uncommit -n "testing uncommit on dirty wdir" -i<<EOF |
232 > y |
234 > y |
233 > n |
235 > n |
234 > y |
236 > y |
235 > EOF |
237 > EOF |
|
238 current hg version does not support storing note in obsmarker |
236 diff --git a/a b/a |
239 diff --git a/a b/a |
237 2 hunks, 3 lines changed |
240 2 hunks, 3 lines changed |
238 examine changes to 'a'? [Ynesfdaq?] y |
241 examine changes to 'a'? [Ynesfdaq?] y |
239 |
242 |
240 @@ -1,5 +1,7 @@ |
243 @@ -1,5 +1,7 @@ |
310 |
313 |
311 Push the changes back to the commit and more commits for more testing |
314 Push the changes back to the commit and more commits for more testing |
312 |
315 |
313 $ hg amend |
316 $ hg amend |
314 $ glog |
317 $ glog |
315 @ 6:905eb2a23ea2@default(draft) another one |
318 @ 7:905eb2a23ea2@default(draft) another one |
316 | |
319 | |
317 o 0:7733902a8d94@default(draft) The base commit |
320 o 0:7733902a8d94@default(draft) The base commit |
318 |
321 |
319 $ touch foo |
322 $ touch foo |
320 $ echo "hey" >> foo |
323 $ echo "hey" >> foo |
453 1 changesets pruned |
456 1 changesets pruned |
454 $ hg revert --all |
457 $ hg revert --all |
455 undeleting a |
458 undeleting a |
456 |
459 |
457 $ glog |
460 $ glog |
458 @ 10:42cc15efbec2@default(draft) Added foo |
461 @ 12:42cc15efbec2@default(draft) Added foo |
459 | |
462 | |
460 o 6:905eb2a23ea2@default(draft) another one |
463 o 7:905eb2a23ea2@default(draft) another one |
461 | |
464 | |
462 o 0:7733902a8d94@default(draft) The base commit |
465 o 0:7733902a8d94@default(draft) The base commit |
463 |
466 |
464 |
467 |
465 Testing when a new file is added in the last commit |
468 Testing when a new file is added in the last commit |
525 |
528 |
526 Testing between the stack and with dirty working copy |
529 Testing between the stack and with dirty working copy |
527 ===================================================== |
530 ===================================================== |
528 |
531 |
529 $ glog |
532 $ glog |
530 @ 16:25a080d13cb2@default(draft) Added x |
533 @ 18:25a080d13cb2@default(draft) Added x |
531 | |
534 | |
532 o 10:42cc15efbec2@default(draft) Added foo |
535 o 12:42cc15efbec2@default(draft) Added foo |
533 | |
536 | |
534 o 6:905eb2a23ea2@default(draft) another one |
537 o 7:905eb2a23ea2@default(draft) another one |
535 | |
538 | |
536 o 0:7733902a8d94@default(draft) The base commit |
539 o 0:7733902a8d94@default(draft) The base commit |
537 |
540 |
538 $ hg up 905eb2a23ea2 |
541 $ hg up 905eb2a23ea2 |
539 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
542 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
605 +babar |
608 +babar |
606 discard change 3/3 to 'a'? [Ynesfdaq?] y |
609 discard change 3/3 to 'a'? [Ynesfdaq?] y |
607 |
610 |
608 patching file a |
611 patching file a |
609 Hunk #1 succeeded at 1 with fuzz 1 (offset -1 lines). |
612 Hunk #1 succeeded at 1 with fuzz 1 (offset -1 lines). |
610 2 new orphan changesets |
613 2 new unstable changesets |
611 |
614 |
612 $ hg diff |
615 $ hg diff |
613 diff -r 676366511f95 a |
616 diff -r 676366511f95 a |
614 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
617 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
615 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
618 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |