| mjpieters |
| Restricted Project |
Namespace order in rebase was changed in https://phab.mercurial-scm.org/D741
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | tests/test-remotefilelog-bgprefetch.t (2 lines) | |||
| M | tests/test-tweakdefaults-ordering.t (2 lines) | |||
| M | tests/test-tweakdefaults-remotenames.t (4 lines) | |||
| M | tests/test-undo.t (2 lines) |
| # background prefetch with repack on rebase when wcprevset configured | # background prefetch with repack on rebase when wcprevset configured | ||||
| $ hg up -r 2 | $ hg up -r 2 | ||||
| 3 files updated, 0 files merged, 3 files removed, 0 files unresolved | 3 files updated, 0 files merged, 3 files removed, 0 files unresolved | ||||
| (leaving bookmark temporary) | (leaving bookmark temporary) | ||||
| $ clearcache | $ clearcache | ||||
| $ find $CACHEDIR -type f | sort | $ find $CACHEDIR -type f | sort | ||||
| $ hg rebase -s temporary -d foo | $ hg rebase -s temporary -d foo | ||||
| rebasing 3:58147a5b5242 "b" (tip temporary) | rebasing 3:58147a5b5242 "b" (temporary tip) | ||||
| saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/58147a5b5242-c3678817-rebase.hg (glob) | saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/58147a5b5242-c3678817-rebase.hg (glob) | ||||
| 3 files fetched over 1 fetches - (3 misses, 0.00% hit ratio) over *s (glob) | 3 files fetched over 1 fetches - (3 misses, 0.00% hit ratio) over *s (glob) | ||||
| $ sleep 1 | $ sleep 1 | ||||
| $ hg debugwaitonprefetch >/dev/null 2>%1 | $ hg debugwaitonprefetch >/dev/null 2>%1 | ||||
| $ sleep 1 | $ sleep 1 | ||||
| $ hg debugwaitonrepack >/dev/null 2>%1 | $ hg debugwaitonrepack >/dev/null 2>%1 | ||||
| # Ensure that file 'y' was prefetched - it was not part of the rebase operation and therefore | # Ensure that file 'y' was prefetched - it was not part of the rebase operation and therefore | ||||
| $ hg bookmark AB | $ hg bookmark AB | ||||
| $ 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" (C tip) | ||||
| saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d5e255ef74f8-7d2cc323-rebase.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d5e255ef74f8-7d2cc323-rebase.hg (glob) | ||||
| abort: you must use a bookmark with tracking or manually specify a destination for the rebase | abort: you must use a bookmark with tracking or manually specify a destination for the rebase | ||||
| (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" (bm tip) | ||||
| saved backup bundle to $TESTTMP/clone/.hg/strip-backup/3de6bbccf693-0dce0663-rebase.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" (bm tip) | ||||
| saved backup bundle to $TESTTMP/clone/.hg/strip-backup/54ac787ff1c5-4c2ca3a1-rebase.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 | ||||
| Check rebase local undos of rebases | Check rebase local undos of rebases | ||||
| Make sure bookmarks and commits are not lost | Make sure bookmarks and commits are not lost | ||||
| and commits are not duplicated | and commits are not duplicated | ||||
| $ cat >> $HGRCPATH <<EOF | $ cat >> $HGRCPATH <<EOF | ||||
| > [extensions] | > [extensions] | ||||
| > rebase = | > rebase = | ||||
| > EOF | > EOF | ||||
| $ hg rebase -s 8057 -d 75f6 | $ hg rebase -s 8057 -d 75f6 | ||||
| rebasing 17:805791ba4bcd "newbranch" (tip newbook) | rebasing 17:805791ba4bcd "newbranch" (newbook tip) | ||||
| $ hg log -l 2 | $ hg log -l 2 | ||||
| changeset: 18:35324a911c0d | changeset: 18:35324a911c0d | ||||
| bookmark: newbook | bookmark: newbook | ||||
| tag: tip | tag: tip | ||||
| parent: 15:75f63379f12b | parent: 15:75f63379f12b | ||||
| user: test | user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: newbranch | summary: newbranch | ||||