Looks like the upstream has changed it on us.
Details
Details
Diff Detail
Diff Detail
- Repository
- rFBHGX Facebook Mercurial Extensions
- Lint
Lint Skipped - Unit
Unit Tests Skipped
quark |
Looks like the upstream has changed it on us.
Lint Skipped |
Unit Tests Skipped |
Path | Packages | |||
---|---|---|---|---|
M | tests/test-copytrace-errormsg.t (2 lines) | |||
M | tests/test-copytrace.t (22 lines) | |||
M | tests/test-dirsync.t (8 lines) | |||
M | tests/test-fastmanifest-access.t (2 lines) | |||
M | tests/test-fbamend.t (26 lines) | |||
M | tests/test-infinitepush-bundlestore.t (2 lines) | |||
M | tests/test-merge-conflictinfo.t (4 lines) | |||
M | tests/test-remotefilelog-linknodes.t (8 lines) | |||
M | tests/test-remotefilelog-local.t (2 lines) | |||
M | tests/test-smartlog.t (2 lines) | |||
M | tests/test-sparse.t (2 lines) | |||
M | tests/test-sqldirstate-shelve.t (2 lines) | |||
M | tests/test-treemanifest-noflat.t (2 lines) | |||
M | tests/test-treemanifest.t (2 lines) | |||
M | tests/test-tweakdefaults-ordering.t (2 lines) | |||
M | tests/test-tweakdefaults-remotenames.t (6 lines) | |||
M | tests/test-tweakdefaults.t (2 lines) | |||
M | tests/test-undo.t (2 lines) |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | ||||
unresolved conflicts (see hg resolve, then hg rebase --continue) | unresolved conflicts (see hg resolve, then hg rebase --continue) | ||||
[1] | [1] | ||||
$ hg rebase --abort | $ hg rebase --abort | ||||
rebase aborted | rebase aborted | ||||
$ hg rebase -s 1 -d . --tracecopies | $ hg rebase -s 1 -d . --tracecopies | ||||
rebasing 1:812796267395 "2" | rebasing 1:812796267395 "2" | ||||
merging 2 and 1 to 2 | merging 2 and 1 to 2 | ||||
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/812796267395-81e11405-backup.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/812796267395-81e11405-rebase.hg (glob) |
|/ desc: mv a b, mv dir/ dir2/, phase: public | |/ desc: mv a b, mv dir/ dir2/, phase: public | ||||
o changeset: 3c482b16e54596fed340d05ffaf155f156cda7ee | o changeset: 3c482b16e54596fed340d05ffaf155f156cda7ee | ||||
desc: initial, phase: public | desc: initial, phase: public | ||||
$ hg rebase -s . -d 1 | $ hg rebase -s . -d 1 | ||||
rebasing 2:557f403c0afd "mod a, mod dir/file.txt" (tip) | rebasing 2:557f403c0afd "mod a, mod dir/file.txt" (tip) | ||||
merging b and a to b | merging b and a to b | ||||
merging dir2/file.txt and dir/file.txt to dir2/file.txt | merging dir2/file.txt and dir/file.txt to dir2/file.txt | ||||
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/557f403c0afd-9926eeff-backup.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/557f403c0afd-9926eeff-rebase.hg (glob) | ||||
$ cd .. | $ cd .. | ||||
$ rm -rf server | $ rm -rf server | ||||
$ rm -rf repo | $ rm -rf repo | ||||
Make sure filename heuristics do not when they are not related | Make sure filename heuristics do not when they are not related | ||||
$ hg init server | $ hg init server | ||||
$ cd server | $ cd server | ||||
$ echo 'somecontent' > a | $ echo 'somecontent' > a | ||||
o changeset: 48e1b6ba639d5d7fb313fa7989eebabf99c9eb83 | o changeset: 48e1b6ba639d5d7fb313fa7989eebabf99c9eb83 | ||||
| desc: randomcommit, phase: public | | desc: randomcommit, phase: public | ||||
o changeset: e5b71fb099c29d9172ef4a23485aaffd497e4cc0 | o changeset: e5b71fb099c29d9172ef4a23485aaffd497e4cc0 | ||||
desc: initial, phase: public | desc: initial, phase: public | ||||
$ hg rebase -s . -d 2 | $ hg rebase -s . -d 2 | ||||
rebasing 3:9d5cf99c3d9f "mod a" (tip) | rebasing 3:9d5cf99c3d9f "mod a" (tip) | ||||
merging b and a to b | merging b and a to b | ||||
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9d5cf99c3d9f-f02358cc-backup.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9d5cf99c3d9f-f02358cc-rebase.hg (glob) | ||||
$ cd .. | $ cd .. | ||||
$ rm -rf server | $ rm -rf server | ||||
$ rm -rf repo | $ rm -rf repo | ||||
Rebase "backwards" | Rebase "backwards" | ||||
$ hg init server | $ hg init server | ||||
$ cd server | $ cd server | ||||
$ echo 'somecontent' > a | $ echo 'somecontent' > a | ||||
o changeset: 48e1b6ba639d5d7fb313fa7989eebabf99c9eb83 | o changeset: 48e1b6ba639d5d7fb313fa7989eebabf99c9eb83 | ||||
| desc: randomcommit, phase: public | | desc: randomcommit, phase: public | ||||
o changeset: e5b71fb099c29d9172ef4a23485aaffd497e4cc0 | o changeset: e5b71fb099c29d9172ef4a23485aaffd497e4cc0 | ||||
desc: initial, phase: public | desc: initial, phase: public | ||||
$ hg rebase -s . -d 0 | $ hg rebase -s . -d 0 | ||||
rebasing 3:fbe97126b396 "mod b" (tip) | rebasing 3:fbe97126b396 "mod b" (tip) | ||||
merging a and b to a | merging a and b to a | ||||
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fbe97126b396-cf5452a1-backup.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fbe97126b396-cf5452a1-rebase.hg (glob) | ||||
$ cd .. | $ cd .. | ||||
$ rm -rf server | $ rm -rf server | ||||
$ rm -rf repo | $ rm -rf repo | ||||
Rebase draft commit on top of draft commit | Rebase draft commit on top of draft commit | ||||
$ hg init repo | $ hg init repo | ||||
$ initclient repo | $ initclient repo | ||||
$ cd repo | $ cd repo | ||||
| o changeset: 542cb58df733ee48fa74729bd2cdb94c9310d362 | | o changeset: 542cb58df733ee48fa74729bd2cdb94c9310d362 | ||||
|/ desc: mv a b, phase: draft | |/ desc: mv a b, phase: draft | ||||
o changeset: e5b71fb099c29d9172ef4a23485aaffd497e4cc0 | o changeset: e5b71fb099c29d9172ef4a23485aaffd497e4cc0 | ||||
desc: initial, phase: draft | desc: initial, phase: draft | ||||
$ hg rebase -s . -d 1 | $ hg rebase -s . -d 1 | ||||
rebasing 2:5268f05aa168 "mod a" (tip) | rebasing 2:5268f05aa168 "mod a" (tip) | ||||
merging b and a to b | merging b and a to b | ||||
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/5268f05aa168-284f6515-backup.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/5268f05aa168-284f6515-rebase.hg (glob) | ||||
$ cd .. | $ cd .. | ||||
$ rm -rf server | $ rm -rf server | ||||
$ rm -rf repo | $ rm -rf repo | ||||
Check a few potential move candidates | Check a few potential move candidates | ||||
$ hg init repo | $ hg init repo | ||||
$ initclient repo | $ initclient repo | ||||
$ cd repo | $ cd repo | ||||
| o changeset: b1784dfab6ea6bfafeb11c0ac50a2981b0fe6ade | | o changeset: b1784dfab6ea6bfafeb11c0ac50a2981b0fe6ade | ||||
|/ desc: mv dir/a dir/b, phase: draft | |/ desc: mv dir/a dir/b, phase: draft | ||||
o changeset: 36859b8907c513a3a87ae34ba5b1e7eea8c20944 | o changeset: 36859b8907c513a3a87ae34ba5b1e7eea8c20944 | ||||
desc: initial, phase: draft | desc: initial, phase: draft | ||||
$ hg rebase -s . -d 2 | $ hg rebase -s . -d 2 | ||||
rebasing 3:6b2f4cece40f "mod dir/a" (tip) | rebasing 3:6b2f4cece40f "mod dir/a" (tip) | ||||
merging dir/b and dir/a to dir/b | merging dir/b and dir/a to dir/b | ||||
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/6b2f4cece40f-503efe60-backup.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/6b2f4cece40f-503efe60-rebase.hg (glob) | ||||
$ cd .. | $ cd .. | ||||
$ rm -rf server | $ rm -rf server | ||||
$ rm -rf repo | $ rm -rf repo | ||||
Move file in one branch and delete it in another | Move file in one branch and delete it in another | ||||
$ hg init repo | $ hg init repo | ||||
$ initclient repo | $ initclient repo | ||||
$ cd repo | $ cd repo | ||||
| desc: del a, phase: draft | | desc: del a, phase: draft | ||||
| o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 | | o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 | ||||
|/ desc: mv a b, phase: draft | |/ desc: mv a b, phase: draft | ||||
o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 | o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 | ||||
desc: initial, phase: draft | desc: initial, phase: draft | ||||
$ hg rebase -s 1 -d 2 | $ hg rebase -s 1 -d 2 | ||||
rebasing 1:472e38d57782 "mv a b" | rebasing 1:472e38d57782 "mv a b" | ||||
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/472e38d57782-17d50e29-backup.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/472e38d57782-17d50e29-rebase.hg (glob) | ||||
$ hg up -q c492ed3c7e35dcd1dc938053b8adf56e2cfbd062 | $ hg up -q c492ed3c7e35dcd1dc938053b8adf56e2cfbd062 | ||||
$ ls | $ ls | ||||
b | b | ||||
$ cd .. | $ cd .. | ||||
$ rm -rf server | $ rm -rf server | ||||
$ rm -rf repo | $ rm -rf repo | ||||
Too many move candidates | Too many move candidates | ||||
| o changeset: 6b2f4cece40fd320f41229f23821256ffc08efea | | o changeset: 6b2f4cece40fd320f41229f23821256ffc08efea | ||||
|/ desc: mod dir/a, phase: draft | |/ desc: mod dir/a, phase: draft | ||||
o changeset: 36859b8907c513a3a87ae34ba5b1e7eea8c20944 | o changeset: 36859b8907c513a3a87ae34ba5b1e7eea8c20944 | ||||
desc: initial, phase: draft | desc: initial, phase: draft | ||||
$ hg rebase -s . -d 1 | $ hg rebase -s . -d 1 | ||||
rebasing 2:a33d80b6e352 "mv dir/ dir2/" (tip) | rebasing 2:a33d80b6e352 "mv dir/ dir2/" (tip) | ||||
merging dir/a and dir2/a to dir2/a | merging dir/a and dir2/a to dir2/a | ||||
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a33d80b6e352-fecb9ada-backup.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a33d80b6e352-fecb9ada-rebase.hg (glob) | ||||
$ cd .. | $ cd .. | ||||
$ rm -rf server | $ rm -rf server | ||||
$ rm -rf repo | $ rm -rf repo | ||||
Move file twice and rebase mod on top of moves | Move file twice and rebase mod on top of moves | ||||
$ hg init repo | $ hg init repo | ||||
$ initclient repo | $ initclient repo | ||||
$ cd repo | $ cd repo | ||||
| | desc: mv b c, phase: draft | | | desc: mv b c, phase: draft | ||||
| o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 | | o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 | ||||
|/ desc: mv a b, phase: draft | |/ desc: mv a b, phase: draft | ||||
o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 | o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 | ||||
desc: initial, phase: draft | desc: initial, phase: draft | ||||
$ hg rebase -s . -d 2 | $ hg rebase -s . -d 2 | ||||
rebasing 3:d41316942216 "mod a" (tip) | rebasing 3:d41316942216 "mod a" (tip) | ||||
merging c and a to c | merging c and a to c | ||||
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d41316942216-2b5949bc-backup.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d41316942216-2b5949bc-rebase.hg (glob) | ||||
$ cd .. | $ cd .. | ||||
$ rm -rf server | $ rm -rf server | ||||
$ rm -rf repo | $ rm -rf repo | ||||
Move file twice and rebase moves on top of mods | Move file twice and rebase moves on top of mods | ||||
$ hg init repo | $ hg init repo | ||||
$ initclient repo | $ initclient repo | ||||
|/ desc: mv a b, phase: draft | |/ desc: mv a b, phase: draft | ||||
o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 | o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 | ||||
desc: initial, phase: draft | desc: initial, phase: draft | ||||
$ hg rebase -s 1 -d . | $ hg rebase -s 1 -d . | ||||
rebasing 1:472e38d57782 "mv a b" | rebasing 1:472e38d57782 "mv a b" | ||||
merging a and b to b | merging a and b to b | ||||
rebasing 2:d3efd280421d "mv b c" | rebasing 2:d3efd280421d "mv b c" | ||||
merging b and c to c | merging b and c to c | ||||
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/472e38d57782-ab8d3c58-backup.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/472e38d57782-ab8d3c58-rebase.hg (glob) | ||||
$ cd .. | $ cd .. | ||||
$ rm -rf server | $ rm -rf server | ||||
$ rm -rf repo | $ rm -rf repo | ||||
Move one file and add another file in the same folder in one branch, modify file in another branch | Move one file and add another file in the same folder in one branch, modify file in another branch | ||||
$ hg init repo | $ hg init repo | ||||
$ initclient repo | $ initclient repo | ||||
| o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 | | o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 | ||||
|/ desc: mv a b, phase: draft | |/ desc: mv a b, phase: draft | ||||
o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 | o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 | ||||
desc: initial, phase: draft | desc: initial, phase: draft | ||||
$ hg rebase -s . -d 2 | $ hg rebase -s . -d 2 | ||||
rebasing 3:ef716627c70b "mod a" (tip) | rebasing 3:ef716627c70b "mod a" (tip) | ||||
merging b and a to b | merging b and a to b | ||||
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/ef716627c70b-24681561-backup.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg (glob) | ||||
$ ls | $ ls | ||||
b | b | ||||
c | c | ||||
$ cat b | $ cat b | ||||
b | b | ||||
Merge test | Merge test | ||||
$ hg init server | $ hg init server | ||||
|/ desc: cp a c, mv a b, phase: draft | |/ desc: cp a c, mv a b, phase: draft | ||||
o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 | o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 | ||||
desc: initial, phase: draft | desc: initial, phase: draft | ||||
$ hg rebase -s . -d 1 | $ hg rebase -s . -d 1 | ||||
rebasing 2:ef716627c70b "mod a" (tip) | rebasing 2:ef716627c70b "mod a" (tip) | ||||
merging b and a to b | merging b and a to b | ||||
merging c and a to c | merging c and a to c | ||||
saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/ef716627c70b-24681561-backup.hg (glob) | saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg (glob) | ||||
$ ls | $ ls | ||||
b | b | ||||
c | c | ||||
$ cat b | $ cat b | ||||
b | b | ||||
$ cat c | $ cat c | ||||
b | b | ||||
$ cd .. | $ cd .. |
stripping intermediate changeset 32cbac0ffaa1 | stripping intermediate changeset 32cbac0ffaa1 | ||||
stripping amended changeset a6e4f018e982 | stripping amended changeset a6e4f018e982 | ||||
2 changesets found | 2 changesets found | ||||
uncompressed size of bundle content: | uncompressed size of bundle content: | ||||
468 (changelog) | 468 (changelog) | ||||
442 (manifests) | 442 (manifests) | ||||
317 dir1/b | 317 dir1/b | ||||
331 dir2/subdir/b | 331 dir2/subdir/b | ||||
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a6e4f018e982-f4dc39cf-amend-backup.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a6e4f018e982-f4dc39cf-amend.hg (glob) | ||||
1 changesets found | 1 changesets found | ||||
uncompressed size of bundle content: | uncompressed size of bundle content: | ||||
282 (changelog) | 282 (changelog) | ||||
223 (manifests) | 223 (manifests) | ||||
199 dir1/b | 199 dir1/b | ||||
213 dir2/subdir/b | 213 dir2/subdir/b | ||||
adding branch | adding branch | ||||
adding changesets | adding changesets | ||||
$ hg up 0 | $ hg up 0 | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ echo b > dir1/a | $ echo b > dir1/a | ||||
$ hg commit --config extensions.dirsync=! -m "edit dir1/a with sync on" | $ hg commit --config extensions.dirsync=! -m "edit dir1/a with sync on" | ||||
created new head | created new head | ||||
$ hg rebase --config extensions.rebase= -d 1 | $ hg rebase --config extensions.rebase= -d 1 | ||||
rebasing 2:70b4edc7f658 "edit dir1/a with sync on" (tip) | rebasing 2:70b4edc7f658 "edit dir1/a with sync on" (tip) | ||||
mirrored changes in 'dir1/a' to 'dir2/a' | mirrored changes in 'dir1/a' to 'dir2/a' | ||||
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/70b4edc7f658-c81f5ea9-backup.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/70b4edc7f658-c81f5ea9-rebase.hg (glob) | ||||
$ hg diff --git -r ".^" -r . | $ hg diff --git -r ".^" -r . | ||||
diff --git a/dir1/a b/dir1/a | diff --git a/dir1/a b/dir1/a | ||||
--- a/dir1/a | --- a/dir1/a | ||||
+++ b/dir1/a | +++ b/dir1/a | ||||
@@ -1,1 +1,1 @@ | @@ -1,1 +1,1 @@ | ||||
-a | -a | ||||
+b | +b | ||||
diff --git a/dir2/a b/dir2/a | diff --git a/dir2/a b/dir2/a | ||||
dir2/a | 1 + | dir2/a | 1 + | ||||
2 files changed, 2 insertions(+), 0 deletions(-) | 2 files changed, 2 insertions(+), 0 deletions(-) | ||||
$ echo a >> dir2/a | $ echo a >> dir2/a | ||||
$ hg commit --amend -m "add dir1/a" dir2/a | $ hg commit --amend -m "add dir1/a" dir2/a | ||||
mirrored changes in 'dir2/a' to 'dir1/a' | mirrored changes in 'dir2/a' to 'dir1/a' | ||||
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9eb46ceb8af3-2c09d2e4-amend-backup.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9eb46ceb8af3-2c09d2e4-amend.hg (glob) | ||||
$ hg status | $ hg status | ||||
A dir1/b | A dir1/b | ||||
$ hg log -r . --stat | $ hg log -r . --stat | ||||
changeset: 0:50bf2325c501 | changeset: 0:50bf2325c501 | ||||
tag: tip | tag: tip | ||||
user: test | user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: add dir1/a | summary: add dir1/a | ||||
dir1/a | 2 ++ | dir1/a | 2 ++ | ||||
dir2/a | 2 ++ | dir2/a | 2 ++ | ||||
2 files changed, 4 insertions(+), 0 deletions(-) | 2 files changed, 4 insertions(+), 0 deletions(-) | ||||
$ echo a >> dir1/a | $ echo a >> dir1/a | ||||
$ hg commit --amend -m "add dir1/a" dir2/a | $ hg commit --amend -m "add dir1/a" dir2/a | ||||
nothing changed | nothing changed | ||||
[1] | [1] | ||||
$ hg commit --amend -m "add dir1/a" | $ hg commit --amend -m "add dir1/a" | ||||
mirrored adding 'dir1/b' to 'dir2/b' | mirrored adding 'dir1/b' to 'dir2/b' | ||||
mirrored changes in 'dir1/a' to 'dir2/a' | mirrored changes in 'dir1/a' to 'dir2/a' | ||||
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/50bf2325c501-ac54e4d9-amend-backup.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/50bf2325c501-ac54e4d9-amend.hg (glob) | ||||
$ hg status | $ hg status | ||||
$ hg log -r . --stat | $ hg log -r . --stat | ||||
changeset: 0:5245011388b8 | changeset: 0:5245011388b8 | ||||
tag: tip | tag: tip | ||||
user: test | user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: add dir1/a | summary: add dir1/a | ||||
$ printaccessedrevs | $ printaccessedrevs | ||||
================================================= | ================================================= | ||||
CACHE MISS [] | CACHE MISS [] | ||||
CACHE HIT ['-1', '2', '3', '4', '5'] | CACHE HIT ['-1', '2', '3', '4', '5'] | ||||
================================================= | ================================================= | ||||
$ hg rebase -r 5:: -d 4 --config extensions.rebase= | $ hg rebase -r 5:: -d 4 --config extensions.rebase= | ||||
rebasing 5:5234b99c4f1d "add e" | rebasing 5:5234b99c4f1d "add e" | ||||
rebasing 6:dd82c74514cb "add f" (tip) | rebasing 6:dd82c74514cb "add f" (tip) | ||||
saved backup bundle to $TESTTMP/accesspattern/.hg/strip-backup/5234b99c4f1d-c2e049ad-backup.hg (glob) | saved backup bundle to $TESTTMP/accesspattern/.hg/strip-backup/5234b99c4f1d-c2e049ad-rebase.hg (glob) | ||||
$ printaccessedrevs | $ printaccessedrevs | ||||
================================================= | ================================================= | ||||
CACHE MISS ['7', '8'] | CACHE MISS ['7', '8'] | ||||
CACHE HIT ['-1', '2', '4', '5', '6'] | CACHE HIT ['-1', '2', '4', '5', '6'] | ||||
================================================= | ================================================= | ||||
$ cd .. | $ cd .. |
$ hg commit -Am 'extra commit to test multiple heads' | $ hg commit -Am 'extra commit to test multiple heads' | ||||
adding x | adding x | ||||
created new head | created new head | ||||
$ hg up 3 | $ hg up 3 | ||||
1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ hg amend --fixup | $ hg amend --fixup | ||||
rebasing the children of 34414ab6546d.preamend | rebasing the children of 34414ab6546d.preamend | ||||
rebasing 2:a764265b74cf "b" | rebasing 2:a764265b74cf "b" | ||||
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a764265b74cf-c5eef4f8-backup.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a764265b74cf-c5eef4f8-rebase.hg (glob) | ||||
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/86cf3bb05fcf-36a6cbd7-preamend-backup.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/86cf3bb05fcf-36a6cbd7-preamend-backup.hg (glob) | ||||
$ echo a >> a | $ echo a >> a | ||||
$ hg amend --rebase | $ hg amend --rebase | ||||
rebasing the children of 7817096bf624.preamend | rebasing the children of 7817096bf624.preamend | ||||
rebasing 3:e1c831172263 "b" | rebasing 3:e1c831172263 "b" | ||||
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/e1c831172263-eee3b8f6-backup.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/e1c831172263-eee3b8f6-rebase.hg (glob) | ||||
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/34414ab6546d-72d06a8e-preamend-backup.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/34414ab6546d-72d06a8e-preamend-backup.hg (glob) | ||||
Test that current bookmark is maintained | Test that current bookmark is maintained | ||||
$ hg bookmark bm | $ hg bookmark bm | ||||
$ hg bookmarks | $ hg bookmarks | ||||
* bm 2:7817096bf624 | * bm 2:7817096bf624 | ||||
$ echo a >> a | $ echo a >> a | ||||
$ hg amend --rebase | $ hg amend --rebase | ||||
rebasing the children of bm.preamend | rebasing the children of bm.preamend | ||||
rebasing 3:1e390e3ec656 "b" | rebasing 3:1e390e3ec656 "b" | ||||
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/1e390e3ec656-8362bab7-backup.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/1e390e3ec656-8362bab7-rebase.hg (glob) | ||||
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/7817096bf624-d72fddeb-preamend-backup.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/7817096bf624-d72fddeb-preamend-backup.hg (glob) | ||||
$ hg bookmarks | $ hg bookmarks | ||||
* bm 2:7635008c16e1 | * bm 2:7635008c16e1 | ||||
Set up education | Set up education | ||||
$ echo "[fbamend]" >> $HGRCPATH | $ echo "[fbamend]" >> $HGRCPATH | ||||
$ echo "education = user education" >> $HGRCPATH | $ echo "education = user education" >> $HGRCPATH | ||||
| o 7635008c16e1 aa bm.preamend | | o 7635008c16e1 aa bm.preamend | ||||
|/ | |/ | ||||
| o 3f6197b00eba extra commit to test multiple heads | | o 3f6197b00eba extra commit to test multiple heads | ||||
|/ | |/ | ||||
o cb9a9f314b8b a | o cb9a9f314b8b a | ||||
$ echo a >> a | $ echo a >> a | ||||
$ hg amend | $ hg amend | ||||
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/edf5fd2f5332-81b0ec5b-amend-backup.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/edf5fd2f5332-81b0ec5b-amend.hg (glob) | ||||
$ hg log -G -T '{node|short} {desc} {bookmarks}\n' | $ hg log -G -T '{node|short} {desc} {bookmarks}\n' | ||||
@ 0889a0030a17 aa bm | @ 0889a0030a17 aa bm | ||||
| | | | ||||
| o 2d6884e15790 b | | o 2d6884e15790 b | ||||
| | | | | | ||||
| o 7635008c16e1 aa bm.preamend | | o 7635008c16e1 aa bm.preamend | ||||
|/ | |/ | ||||
| o 3f6197b00eba extra commit to test multiple heads | | o 3f6197b00eba extra commit to test multiple heads | ||||
|/ | |/ | ||||
o cb9a9f314b8b a | o cb9a9f314b8b a | ||||
$ hg amend --fixup | $ hg amend --fixup | ||||
rebasing the children of bm.preamend | rebasing the children of bm.preamend | ||||
rebasing 3:2d6884e15790 "b" | rebasing 3:2d6884e15790 "b" | ||||
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/2d6884e15790-909076cb-backup.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/2d6884e15790-909076cb-rebase.hg (glob) | ||||
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/7635008c16e1-65f65ff6-preamend-backup.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/7635008c16e1-65f65ff6-preamend-backup.hg (glob) | ||||
$ hg log -G -T '{node|short} {desc} {bookmarks}\n' | $ hg log -G -T '{node|short} {desc} {bookmarks}\n' | ||||
o 6ba7926ba204 b | o 6ba7926ba204 b | ||||
| | | | ||||
@ 0889a0030a17 aa bm | @ 0889a0030a17 aa bm | ||||
| | | | ||||
| o 3f6197b00eba extra commit to test multiple heads | | o 3f6197b00eba extra commit to test multiple heads | ||||
|/ | |/ | ||||
| o 0889a0030a17 aa 94eb429c9465.preamend | | o 0889a0030a17 aa 94eb429c9465.preamend | ||||
|/ | |/ | ||||
| o 3f6197b00eba extra commit to test multiple heads | | o 3f6197b00eba extra commit to test multiple heads | ||||
|/ | |/ | ||||
o cb9a9f314b8b a | o cb9a9f314b8b a | ||||
$ echo a >> a | $ echo a >> a | ||||
$ hg amend | $ hg amend | ||||
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/94eb429c9465-30a7ee2c-amend-backup.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/94eb429c9465-30a7ee2c-amend.hg (glob) | ||||
$ hg log -G -T '{node|short} {desc} {bookmarks}\n' | $ hg log -G -T '{node|short} {desc} {bookmarks}\n' | ||||
@ 83455f1f6049 aa | @ 83455f1f6049 aa | ||||
| | | | ||||
| o 6ba7926ba204 b | | o 6ba7926ba204 b | ||||
| | | | | | ||||
| o 0889a0030a17 aa 83455f1f6049.preamend | | o 0889a0030a17 aa 83455f1f6049.preamend | ||||
|/ | |/ | ||||
| o 3f6197b00eba extra commit to test multiple heads | | o 3f6197b00eba extra commit to test multiple heads | ||||
|/ | |/ | ||||
o cb9a9f314b8b a | o cb9a9f314b8b a | ||||
$ hg amend --fixup | $ hg amend --fixup | ||||
rebasing the children of 83455f1f6049.preamend | rebasing the children of 83455f1f6049.preamend | ||||
rebasing 3:6ba7926ba204 "b" | rebasing 3:6ba7926ba204 "b" | ||||
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/6ba7926ba204-9ac223ef-backup.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/6ba7926ba204-9ac223ef-rebase.hg (glob) | ||||
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0889a0030a17-6bebea0c-preamend-backup.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0889a0030a17-6bebea0c-preamend-backup.hg (glob) | ||||
$ hg log -G -T '{node|short} {desc} {bookmarks}\n' | $ hg log -G -T '{node|short} {desc} {bookmarks}\n' | ||||
o 455e4104f605 b | o 455e4104f605 b | ||||
| | | | ||||
@ 83455f1f6049 aa | @ 83455f1f6049 aa | ||||
| | | | ||||
| o 3f6197b00eba extra commit to test multiple heads | | o 3f6197b00eba extra commit to test multiple heads | ||||
|/ | |/ | ||||
|/ | |/ | ||||
o cb9a9f314b8b a | o cb9a9f314b8b a | ||||
$ hg amend --rebase | $ hg amend --rebase | ||||
abort: histedit in progress | abort: histedit in progress | ||||
(during histedit, use amend without --rebase) | (during histedit, use amend without --rebase) | ||||
[255] | [255] | ||||
$ hg commit --amend -m 'commit --amend message' | $ hg commit --amend -m 'commit --amend message' | ||||
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a2329fab3fab-e6fb940f-amend-backup.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a2329fab3fab-e6fb940f-amend.hg (glob) | ||||
$ hg log -G -T '{node|short} {desc} {bookmarks}\n' | $ hg log -G -T '{node|short} {desc} {bookmarks}\n' | ||||
@ 3166f3b5587d commit --amend message | @ 3166f3b5587d commit --amend message | ||||
| | | | ||||
o 048e86baa19d message from exec | o 048e86baa19d message from exec | ||||
| | | | ||||
| o 765b28efbe8b c | | o 765b28efbe8b c | ||||
| | | | | | ||||
| o 455e4104f605 b | | o 455e4104f605 b | ||||
o cb9a9f314b8b a | o cb9a9f314b8b a | ||||
Test that --message is respected | Test that --message is respected | ||||
$ hg amend | $ hg amend | ||||
nothing changed | nothing changed | ||||
[1] | [1] | ||||
$ hg amend --message foo | $ hg amend --message foo | ||||
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0f83a9508203-7d2a99ee-amend-backup.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0f83a9508203-7d2a99ee-amend.hg (glob) | ||||
$ hg amend -m bar | $ hg amend -m bar | ||||
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/29272a1da891-35a82ce4-amend-backup.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/29272a1da891-35a82ce4-amend.hg (glob) | ||||
$ hg amend | $ hg amend | ||||
nothing changed | nothing changed | ||||
[1] | [1] | ||||
Test that --addremove/-A works | Test that --addremove/-A works | ||||
$ echo new > new | $ echo new > new | ||||
$ hg amend -A | $ hg amend -A | ||||
adding new | adding new | ||||
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/772f45f5a69d-90a7bd63-amend-backup.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/772f45f5a69d-90a7bd63-amend.hg (glob) | ||||
Test that the extension disables itself when evolution is enabled | Test that the extension disables itself when evolution is enabled | ||||
$ cat >> .hg/hgrc <<EOF | $ cat >> .hg/hgrc <<EOF | ||||
> [extensions] | > [extensions] | ||||
> fbamend=$TESTDIR/../hgext3rd/fbamend | > fbamend=$TESTDIR/../hgext3rd/fbamend | ||||
> EOF | > EOF | ||||
$ hg amend | $ hg amend | ||||
user education | user education | ||||
second line | second line | ||||
warning: the changeset's children were left behind | warning: the changeset's children were left behind | ||||
(use 'hg restack' to rebase them) | (use 'hg restack' to rebase them) | ||||
$ hg amend --fixup | $ hg amend --fixup | ||||
rebasing the children of f2d4abddbbcd.preamend | rebasing the children of f2d4abddbbcd.preamend | ||||
rebasing 2:4538525df7e2 "add c" | rebasing 2:4538525df7e2 "add c" | ||||
saved backup bundle to $TESTTMP/inhibitrepo/.hg/strip-backup/4538525df7e2-0bcb0716-backup.hg (glob) | saved backup bundle to $TESTTMP/inhibitrepo/.hg/strip-backup/4538525df7e2-0bcb0716-rebase.hg (glob) | ||||
saved backup bundle to $TESTTMP/inhibitrepo/.hg/strip-backup/7c3bad9141dc-81844e36-preamend-backup.hg (glob) | saved backup bundle to $TESTTMP/inhibitrepo/.hg/strip-backup/7c3bad9141dc-81844e36-preamend-backup.hg (glob) | ||||
$ hg log --template '{node|short} {desc}' --graph | $ hg log --template '{node|short} {desc}' --graph | ||||
o 084836c39cc1 add c | o 084836c39cc1 add c | ||||
| | | | ||||
@ f2d4abddbbcd add b | @ f2d4abddbbcd add b | ||||
| | | | ||||
o 1f0dee641bb7 add a | o 1f0dee641bb7 add a | ||||
$ hg up tip | $ hg up tip | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ mkcommit d | $ mkcommit d | ||||
$ hg up ".^" -q | $ hg up ".^" -q | ||||
$ echo "hello" > c | $ echo "hello" > c | ||||
$ hg amend --rebase | $ hg amend --rebase | ||||
rebasing the children of 6d41fcaa1aa4.preamend | rebasing the children of 6d41fcaa1aa4.preamend | ||||
rebasing 3:3a033d20b13a "add d" | rebasing 3:3a033d20b13a "add d" | ||||
saved backup bundle to $TESTTMP/inhibitrepo/.hg/strip-backup/3a033d20b13a-c275a49d-backup.hg (glob) | saved backup bundle to $TESTTMP/inhibitrepo/.hg/strip-backup/3a033d20b13a-c275a49d-rebase.hg (glob) | ||||
saved backup bundle to $TESTTMP/inhibitrepo/.hg/strip-backup/084836c39cc1-e86e0471-preamend-backup.hg (glob) | saved backup bundle to $TESTTMP/inhibitrepo/.hg/strip-backup/084836c39cc1-e86e0471-preamend-backup.hg (glob) | ||||
$ hg log --template '{node|short} {desc}' --graph | $ hg log --template '{node|short} {desc}' --graph | ||||
o cc9fcfa87676 add d | o cc9fcfa87676 add d | ||||
| | | | ||||
@ 6d41fcaa1aa4 add c | @ 6d41fcaa1aa4 add c | ||||
| | | | ||||
o f2d4abddbbcd add b | o f2d4abddbbcd add b | ||||
| | | |
d8c4f54ab678fd67cb90bb3f272a2dc6513a59a7 cd0586065eaf8b483698518f5fc32531e36fd8e0 | d8c4f54ab678fd67cb90bb3f272a2dc6513a59a7 cd0586065eaf8b483698518f5fc32531e36fd8e0 | ||||
Non-fastforward scratch bookmark push | Non-fastforward scratch bookmark push | ||||
$ hg up 6c10d49fe927 | $ hg up 6c10d49fe927 | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ echo 1 > amend | $ echo 1 > amend | ||||
$ hg add amend | $ hg add amend | ||||
$ hg ci --amend -m 'scratch amended commit' | $ hg ci --amend -m 'scratch amended commit' | ||||
saved backup bundle to $TESTTMP/client/.hg/strip-backup/6c10d49fe927-a7adb791-amend-backup.hg (glob) | saved backup bundle to $TESTTMP/client/.hg/strip-backup/6c10d49fe927-a7adb791-amend.hg (glob) | ||||
$ hg log -G -T '{desc} {phase} {bookmarks}' | $ hg log -G -T '{desc} {phase} {bookmarks}' | ||||
@ scratch amended commit draft scratch/mybranch | @ scratch amended commit draft scratch/mybranch | ||||
| | | | ||||
o scratchcommitwithpushrebase draft | o scratchcommitwithpushrebase draft | ||||
| | | | ||||
o scratchcommitnobook draft | o scratchcommitnobook draft | ||||
| | | | ||||
o new scratch commit draft | o new scratch commit draft |
o (0) base | o (0) base | ||||
affected: file | affected: file | ||||
deleted: | deleted: | ||||
$ hg rebase -d 2 -s 1 | $ hg rebase -d 2 -s 1 | ||||
rebasing 1:ec87889f5f90 "source" | rebasing 1:ec87889f5f90 "source" | ||||
merging file_newloc and file to file_newloc | merging file_newloc and file to file_newloc | ||||
saved backup bundle to $TESTTMP/cornercases/foo/foo/foo/foo/.hg/strip-backup/ec87889f5f90-e39a76b8-backup.hg (glob) | saved backup bundle to $TESTTMP/cornercases/foo/foo/foo/foo/.hg/strip-backup/ec87889f5f90-e39a76b8-rebase.hg (glob) | ||||
$ hg up -q 2 # source | $ hg up -q 2 # source | ||||
$ cat file_newloc # Should follow: | $ cat file_newloc # Should follow: | ||||
change | change | ||||
$ hg resolve --tool=internal:dumpjson --all | $ hg resolve --tool=internal:dumpjson --all | ||||
[ | [ | ||||
{ | { | ||||
"command": null, | "command": null, | ||||
"conflicts": [] | "conflicts": [] | ||||
o (0) base | o (0) base | ||||
affected: file | affected: file | ||||
deleted: | deleted: | ||||
$ hg rebase -d 2 -s 1 | $ hg rebase -d 2 -s 1 | ||||
rebasing 1:e6e7483a8950 "source" | rebasing 1:e6e7483a8950 "source" | ||||
merging file and file_newloc to file_newloc | merging file and file_newloc to file_newloc | ||||
saved backup bundle to $TESTTMP/cornercases/foo/foo/foo/foo/.hg/strip-backup/e6e7483a8950-8e128ac2-backup.hg (glob) | saved backup bundle to $TESTTMP/cornercases/foo/foo/foo/foo/.hg/strip-backup/e6e7483a8950-8e128ac2-rebase.hg (glob) | ||||
$ hg up 2 | $ hg up 2 | ||||
1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ cat file_newloc | $ cat file_newloc | ||||
change | change | ||||
$ hg resolve --tool=internal:dumpjson --all | $ hg resolve --tool=internal:dumpjson --all | ||||
[ | [ | ||||
{ | { | ||||
"command": null, | "command": null, |
$ echo x >> x | $ echo x >> x | ||||
$ hg commit -qAm xx | $ hg commit -qAm xx | ||||
$ hg log -f x --template "{node|short}\n" | $ hg log -f x --template "{node|short}\n" | ||||
0632994590a8 | 0632994590a8 | ||||
b292c1e3311f | b292c1e3311f | ||||
$ hg rebase -d 1 | $ hg rebase -d 1 | ||||
rebasing 2:0632994590a8 "xx" (tip) | rebasing 2:0632994590a8 "xx" (tip) | ||||
saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/0632994590a8-0bc786d8-backup.hg (glob) | saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/0632994590a8-0bc786d8-rebase.hg (glob) | ||||
$ hg log -f x --template "{node|short}\n" | $ hg log -f x --template "{node|short}\n" | ||||
81deab2073bc | 81deab2073bc | ||||
b292c1e3311f | b292c1e3311f | ||||
# Rebase back, log -f still works | # Rebase back, log -f still works | ||||
$ hg rebase -d 0 -r 2 | $ hg rebase -d 0 -r 2 | ||||
rebasing 2:81deab2073bc "xx" (tip) | rebasing 2:81deab2073bc "xx" (tip) | ||||
saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/81deab2073bc-80cb4fda-backup.hg (glob) | saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/81deab2073bc-80cb4fda-rebase.hg (glob) | ||||
$ hg log -f x --template "{node|short}\n" | $ hg log -f x --template "{node|short}\n" | ||||
b3fca10fb42d | b3fca10fb42d | ||||
b292c1e3311f | b292c1e3311f | ||||
$ hg rebase -d 1 -r 2 | $ hg rebase -d 1 -r 2 | ||||
rebasing 2:b3fca10fb42d "xx" (tip) | rebasing 2:b3fca10fb42d "xx" (tip) | ||||
saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/b3fca10fb42d-da73a0c7-backup.hg (glob) | saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/b3fca10fb42d-da73a0c7-rebase.hg (glob) | ||||
$ cd .. | $ cd .. | ||||
# Reset repos | # Reset repos | ||||
$ clearcache | $ clearcache | ||||
$ rm -rf master | $ rm -rf master | ||||
$ rm -rf shallow | $ rm -rf shallow | ||||
$ echo y >> x | $ echo y >> x | ||||
$ hg commit -Aqm xxy | $ hg commit -Aqm xxy | ||||
$ hg pull -q | $ hg pull -q | ||||
$ hg rebase -d tip | $ hg rebase -d tip | ||||
rebasing 1:4549721d828f "xx2" | rebasing 1:4549721d828f "xx2" | ||||
note: rebase of 1:4549721d828f created no changes to commit | note: rebase of 1:4549721d828f created no changes to commit | ||||
rebasing 2:5ef6d97e851c "xxy" | rebasing 2:5ef6d97e851c "xxy" | ||||
saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/4549721d828f-b084e33c-backup.hg (glob) | saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/4549721d828f-b084e33c-rebase.hg (glob) | ||||
$ hg log -f x --template '{node|short}\n' | $ hg log -f x --template '{node|short}\n' | ||||
4ae8e31c85ef | 4ae8e31c85ef | ||||
0632994590a8 | 0632994590a8 | ||||
b292c1e3311f | b292c1e3311f | ||||
$ cd .. | $ cd .. | ||||
# system cache has invalid linknode, but .hg/store/data has valid | # system cache has invalid linknode, but .hg/store/data has valid |
adding changesets | adding changesets | ||||
adding manifests | adding manifests | ||||
adding file changes | adding file changes | ||||
added 1 changesets with 0 changes to 0 files (+1 heads) | added 1 changesets with 0 changes to 0 files (+1 heads) | ||||
(run 'hg heads' to see heads, 'hg merge' to merge) | (run 'hg heads' to see heads, 'hg merge' to merge) | ||||
$ hg rebase -d tip | $ hg rebase -d tip | ||||
rebasing 1:9abfe7bca547 "a" | rebasing 1:9abfe7bca547 "a" | ||||
saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/9abfe7bca547-8b11e5ff-backup.hg (glob) | saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/9abfe7bca547-8b11e5ff-rebase.hg (glob) | ||||
3 files fetched over 2 fetches - (3 misses, 0.00% hit ratio) over *s (glob) | 3 files fetched over 2 fetches - (3 misses, 0.00% hit ratio) over *s (glob) | ||||
# strip | # strip | ||||
$ clearcache | $ clearcache | ||||
$ hg debugrebuilddirstate # fixes dirstate non-determinism | $ hg debugrebuilddirstate # fixes dirstate non-determinism | ||||
$ hg strip -r . | $ hg strip -r . | ||||
2 files updated, 0 files merged, 1 files removed, 0 files unresolved | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|/ b | |/ b | ||||
| | | | ||||
o 1 b68836a6e2ca 1970-01-01 00:00 +0000 test | o 1 b68836a6e2ca 1970-01-01 00:00 +0000 test | ||||
| a2 | | a2 | ||||
| | | | ||||
With commit info | With commit info | ||||
$ echo "hello" >c2 && hg ci --amend | $ echo "hello" >c2 && hg ci --amend | ||||
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/db92053d5c83-f9f5e1aa-amend-backup.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/db92053d5c83-f9f5e1aa-amend.hg (glob) | ||||
$ hg smartlog -T compact --commit-info | $ hg smartlog -T compact --commit-info | ||||
@ 5[tip][feature2] 05d10250273e 1970-01-01 00:00 +0000 test | @ 5[tip][feature2] 05d10250273e 1970-01-01 00:00 +0000 test | ||||
| d | | d | ||||
| | | | ||||
| M c2 | | M c2 | ||||
| A d | | A d | ||||
| | | | ||||
o 4[master] 38d85b506754 1970-01-01 00:00 +0000 test | o 4[master] 38d85b506754 1970-01-01 00:00 +0000 test |
M show | M show | ||||
? show2 | ? show2 | ||||
Verify rebase succeeds if all changed files are in sparse checkout | Verify rebase succeeds if all changed files are in sparse checkout | ||||
$ hg commit -Aqm "add show2" | $ hg commit -Aqm "add show2" | ||||
$ hg rebase -d 1 --config extensions.rebase= | $ hg rebase -d 1 --config extensions.rebase= | ||||
rebasing 2:bdde55290160 "add show2" (tip) | rebasing 2:bdde55290160 "add show2" (tip) | ||||
saved backup bundle to $TESTTMP/myrepo/.hg/strip-backup/bdde55290160-216ed9c6-backup.hg (glob) | saved backup bundle to $TESTTMP/myrepo/.hg/strip-backup/bdde55290160-216ed9c6-rebase.hg (glob) | ||||
Verify log --sparse only shows commits that affect the sparse checkout | Verify log --sparse only shows commits that affect the sparse checkout | ||||
$ hg log -T '{rev} ' | $ hg log -T '{rev} ' | ||||
2 1 0 (no-eol) | 2 1 0 (no-eol) | ||||
$ hg log --sparse -T '{rev} ' | $ hg log --sparse -T '{rev} ' | ||||
2 0 (no-eol) | 2 0 (no-eol) | ||||
$ hg commit -Aqm xyz | $ hg commit -Aqm xyz | ||||
$ echo c >> z | $ echo c >> z | ||||
$ hg shelve | $ hg shelve | ||||
shelved as default | shelved as default | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ hg rebase -d 1 --config extensions.rebase= | $ hg rebase -d 1 --config extensions.rebase= | ||||
rebasing 2:323bfa07f744 "xyz" (tip) | rebasing 2:323bfa07f744 "xyz" (tip) | ||||
merging x | merging x | ||||
saved backup bundle to $TESTTMP/shelverebase/.hg/strip-backup/323bfa07f744-78114325-backup.hg (glob) | saved backup bundle to $TESTTMP/shelverebase/.hg/strip-backup/323bfa07f744-78114325-rebase.hg (glob) | ||||
$ hg unshelve | $ hg unshelve | ||||
unshelving change 'default' | unshelving change 'default' | ||||
rebasing shelved changes | rebasing shelved changes | ||||
rebasing 4:82a0d7d6ba61 "changes to: xyz" (tip) | rebasing 4:82a0d7d6ba61 "changes to: xyz" (tip) | ||||
$ hg status | $ hg status | ||||
M z | M z | ||||
$ cd .. | $ cd .. |
# Test that rebase access the flat text only once, for the final commit | # Test that rebase access the flat text only once, for the final commit | ||||
$ hg rebase -d 1 -r 2 | $ hg rebase -d 1 -r 2 | ||||
read flat manifest | read flat manifest | ||||
File "*/fastmanifest/implementation.py", line *, in add (glob) | File "*/fastmanifest/implementation.py", line *, in add (glob) | ||||
p1text = origself.revision(p1) | p1text = origself.revision(p1) | ||||
rebasing 2:667a26a14261 "modify b" (tip) | rebasing 2:667a26a14261 "modify b" (tip) | ||||
saved backup bundle to $TESTTMP/client/.hg/strip-backup/667a26a14261-d769c687-backup.hg (glob) | saved backup bundle to $TESTTMP/client/.hg/strip-backup/667a26a14261-d769c687-rebase.hg (glob) |
$ echo >> subdir/y | $ echo >> subdir/y | ||||
$ hg commit -qAm 'modify subdir/y' | $ hg commit -qAm 'modify subdir/y' | ||||
$ echo >> subdir/y | $ echo >> subdir/y | ||||
$ hg commit -Am 'modify subdir/y again' | $ hg commit -Am 'modify subdir/y again' | ||||
$ hg rebase -d 0 -s '.^' | $ hg rebase -d 0 -s '.^' | ||||
rebasing 3:6a2476258ba5 "modify subdir/y" | rebasing 3:6a2476258ba5 "modify subdir/y" | ||||
rebasing 4:f096b21e165f "modify subdir/y again" (tip) | rebasing 4:f096b21e165f "modify subdir/y again" (tip) | ||||
saved backup bundle to $TESTTMP/client/.hg/strip-backup/6a2476258ba5-a90056a1-backup.hg (glob) | saved backup bundle to $TESTTMP/client/.hg/strip-backup/6a2476258ba5-a90056a1-rebase.hg (glob) | ||||
$ hg log -r '.^::.' -T '{manifest}\n' | $ hg log -r '.^::.' -T '{manifest}\n' | ||||
3:0d05c20bb7eb | 3:0d05c20bb7eb | ||||
4:8289b85c6a30 | 4:8289b85c6a30 | ||||
$ hg debugdatapack .hg/store/packs/manifests/5a5fb42e99986c90ac86b57d184561c44238b7b7.datapack | $ hg debugdatapack .hg/store/packs/manifests/5a5fb42e99986c90ac86b57d184561c44238b7b7.datapack | ||||
subdir | subdir | ||||
Node Delta Base Delta Length | Node Delta Base Delta Length | ||||
a4e2f032ee0f 000000000000 43 | a4e2f032ee0f 000000000000 43 |
$ hg up ".^" | $ hg up ".^" | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
(leaving bookmark AB) | (leaving bookmark AB) | ||||
$ touch c | $ touch c | ||||
$ hg commit -Aqm c | $ hg commit -Aqm c | ||||
$ hg bookmark C -t AB | $ hg bookmark C -t AB | ||||
$ hg rebase | $ hg rebase | ||||
rebasing 2:d5e255ef74f8 "c" (tip C) | rebasing 2:d5e255ef74f8 "c" (tip C) | ||||
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d5e255ef74f8-7d2cc323-backup.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d5e255ef74f8-7d2cc323-rebase.hg (glob) | ||||
(set up tracking with `hg book -t <destination>` or manually supply --dest / -d) | (set up tracking with `hg book -t <destination>` or manually supply --dest / -d) | ||||
[255] | [255] | ||||
$ hg book bm -t default/two | $ hg book bm -t default/two | ||||
$ hg pull --rebase | $ hg pull --rebase | ||||
pulling from $TESTTMP/repo (glob) | pulling from $TESTTMP/repo (glob) | ||||
searching for changes | searching for changes | ||||
no changes found | no changes found | ||||
rebasing 3:3de6bbccf693 "foo" (tip bm) | rebasing 3:3de6bbccf693 "foo" (tip bm) | ||||
saved backup bundle to $TESTTMP/clone/.hg/strip-backup/3de6bbccf693-0dce0663-backup.hg (glob) | saved backup bundle to $TESTTMP/clone/.hg/strip-backup/3de6bbccf693-0dce0663-rebase.hg (glob) | ||||
$ hg pull --rebase --dest three | $ hg pull --rebase --dest three | ||||
pulling from $TESTTMP/repo (glob) | pulling from $TESTTMP/repo (glob) | ||||
searching for changes | searching for changes | ||||
no changes found | no changes found | ||||
rebasing 3:54ac787ff1c5 "foo" (tip bm) | rebasing 3:54ac787ff1c5 "foo" (tip bm) | ||||
saved backup bundle to $TESTTMP/clone/.hg/strip-backup/54ac787ff1c5-4c2ca3a1-backup.hg (glob) | saved backup bundle to $TESTTMP/clone/.hg/strip-backup/54ac787ff1c5-4c2ca3a1-rebase.hg (glob) | ||||
Test that hg pull --update aborts without --dest | Test that hg pull --update aborts without --dest | ||||
$ hg pull --update | $ hg pull --update | ||||
abort: you must specify a destination for the update | abort: you must specify a destination for the update | ||||
(use `hg pull --update --dest <destination>`) | (use `hg pull --update --dest <destination>`) | ||||
[255] | [255] | ||||
$ hg pull --update --dest one | $ hg pull --update --dest one | ||||
pulling from $TESTTMP/repo (glob) | pulling from $TESTTMP/repo (glob) | ||||
searching for changes | searching for changes | ||||
adding changesets | adding changesets | ||||
adding manifests | adding manifests | ||||
adding file changes | adding file changes | ||||
added 1 changesets with 1 changes to 1 files (+1 heads) | added 1 changesets with 1 changes to 1 files (+1 heads) | ||||
(run 'hg heads .' to see heads, 'hg merge' to merge) | (run 'hg heads .' to see heads, 'hg merge' to merge) | ||||
rebasing 4:ba0f83735c95 "d" | rebasing 4:ba0f83735c95 "d" | ||||
merging d | merging d | ||||
saved backup bundle to $TESTTMP/clone/.hg/strip-backup/ba0f83735c95-ba455273-backup.hg (glob) | saved backup bundle to $TESTTMP/clone/.hg/strip-backup/ba0f83735c95-ba455273-rebase.hg (glob) | ||||
$ hg log -G --all -T '{node|short} {bookmarks} {remotenames}' | $ hg log -G --all -T '{node|short} {bookmarks} {remotenames}' | ||||
@ d6553cf01770 | @ d6553cf01770 | ||||
| | | | ||||
o e8aa3bc9f3f0 default/three default/default | o e8aa3bc9f3f0 default/three default/default | ||||
| | | | ||||
| o 5413b62180b7 bm | | o 5413b62180b7 bm | ||||
|/ | |/ | ||||
o 083f922fc4a9 | o 083f922fc4a9 | ||||
| | | | ||||
o 301d76bdc3ae default/two | o 301d76bdc3ae default/two | ||||
| | | | ||||
o 8f0162e483d0 default/one | o 8f0162e483d0 default/one | ||||
$ cat d | $ cat d | ||||
d created at remote | d created at remote | ||||
d | d |
Empty rebase fails | Empty rebase fails | ||||
$ hg rebase | $ hg rebase | ||||
abort: you must specify a destination (-d) for the rebase | abort: you must specify a destination (-d) for the rebase | ||||
[255] | [255] | ||||
$ hg rebase -d 2 | $ hg rebase -d 2 | ||||
rebasing 1:7b4cb4e1674c "b" | rebasing 1:7b4cb4e1674c "b" | ||||
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/7b4cb4e1674c-f22b5b1e-backup.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/7b4cb4e1674c-f22b5b1e-rebase.hg (glob) | ||||
Empty rebase with nooprebase=True (default) succeeds | Empty rebase with nooprebase=True (default) succeeds | ||||
$ hg rebase -s tip -d "tip^1" | $ hg rebase -s tip -d "tip^1" | ||||
nothing to rebase | nothing to rebase | ||||
Empty rebase with nooprebase=False fails | Empty rebase with nooprebase=False fails | ||||
$ hg debugdata .hg/store/undolog/index.i 1 | $ hg debugdata .hg/store/undolog/index.i 1 | ||||
bookmarks 8153d44860d076e9c328951c8f36cf8daebe695a | bookmarks 8153d44860d076e9c328951c8f36cf8daebe695a | ||||
command 440cdcef588f9a594c5530a5b6dede39a96d930d | command 440cdcef588f9a594c5530a5b6dede39a96d930d | ||||
date * (glob) | date * (glob) | ||||
draftheads b80de5d138758541c5f05265ad144ab9fa86d1db | draftheads b80de5d138758541c5f05265ad144ab9fa86d1db | ||||
workingparent fcb754f6a51eaf982f66d0637b39f3d2e6b520d5 (no-eol) | workingparent fcb754f6a51eaf982f66d0637b39f3d2e6b520d5 (no-eol) | ||||
$ touch a3 && hg add a3 | $ touch a3 && hg add a3 | ||||
$ hg commit --amend | $ hg commit --amend | ||||
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/db92053d5c83-e25f6bc1-amend-backup.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/db92053d5c83-e25f6bc1-amend.hg (glob) | ||||
$ hg debugdata .hg/store/undolog/command.i 11 | $ hg debugdata .hg/store/undolog/command.i 11 | ||||
commit\x00--amend (no-eol) (esc) | commit\x00--amend (no-eol) (esc) | ||||
Test debugundohistory | Test debugundohistory | ||||
$ hg debugundohistory -l | $ hg debugundohistory -l | ||||
0: commit --amend | 0: commit --amend | ||||
1: ci -md | 1: ci -md | ||||
2: book feature2 | 2: book feature2 |