Mercurial > evolve
comparison tests/test-uncommit-interactive.t @ 3818:f8677cb11dcb mercurial-4.3
test-compat: merge mercurial-4.4 into mercurial-4.3
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Fri, 08 Jun 2018 22:52:53 +0530 |
| parents | e5ba6531503e |
| children |
comparison
equal
deleted
inserted
replaced
| 3817:5ca297e78f2c | 3818:f8677cb11dcb |
|---|---|
| 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 @@ |
| 166 | 168 |
| 167 $ hg obslog | 169 $ hg obslog |
| 168 @ 678a59e5ff90 (3) another one | 170 @ 678a59e5ff90 (3) another one |
| 169 | | 171 | |
| 170 x f70fb463d5bf (1) another one | 172 x f70fb463d5bf (1) another one |
| 171 rewritten(content) as 678a59e5ff90 using uncommit by test (Thu Jan 01 00:00:00 1970 +0000) | 173 rewritten(content) as 678a59e5ff90 by test (Thu Jan 01 00:00:00 1970 +0000) |
| 172 note: note on amend --extract | 174 note: note on amend --extract |
| 173 | 175 |
| 174 The unselected part should be in the diff | 176 The unselected part should be in the diff |
| 175 ----------------------------------------- | 177 ----------------------------------------- |
| 176 | 178 |
| 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 @@ |
| 298 | 301 |
| 299 $ hg obslog | 302 $ hg obslog |
| 300 @ 46e35360be47 (5) another one | 303 @ 46e35360be47 (5) another one |
| 301 | | 304 | |
| 302 x 678a59e5ff90 (3) another one | 305 x 678a59e5ff90 (3) another one |
| 303 | rewritten(content) as 46e35360be47 using uncommit by test (Thu Jan 01 00:00:00 1970 +0000) | 306 | rewritten(content) as 46e35360be47 by test (Thu Jan 01 00:00:00 1970 +0000) |
| 304 | note: testing uncommit on dirty wdir | 307 | note: testing uncommit on dirty wdir |
| 305 | | 308 | |
| 306 x f70fb463d5bf (1) another one | 309 x f70fb463d5bf (1) another one |
| 307 rewritten(content) as 678a59e5ff90 using uncommit by test (Thu Jan 01 00:00:00 1970 +0000) | 310 rewritten(content) as 678a59e5ff90 by test (Thu Jan 01 00:00:00 1970 +0000) |
| 308 note: note on amend --extract | 311 note: note on amend --extract |
| 309 | 312 |
| 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 |