mirror of
https://github.com/facebook/sapling.git
synced 2024-10-12 01:39:21 +03:00
ad813edcbd
Summary: Now that all our repos are treemanifest, let's enable the extension by default in tests. Once we're certain no one needs it in production we'll also make it the default in core Mercurial. This diff includes a minor fix in treemanifest to be aware of always-enabled extensions. It won't matter until we actually add treemanifest to the list of default enabled extensions, but I caught this while testing things. Reviewed By: ikostia Differential Revision: D15030253 fbshipit-source-id: d8361f915928b6ad90665e6ed330c1df5c8d8d86
63 lines
1.5 KiB
Perl
63 lines
1.5 KiB
Perl
$ setconfig extensions.treemanifest=!
|
|
TODO: Make this test compatibile with obsstore enabled.
|
|
$ setconfig experimental.evolution=
|
|
|
|
Set up with remotenames
|
|
$ cat >> $HGRCPATH << EOF
|
|
> [extensions]
|
|
> rebase=
|
|
> remotenames=
|
|
> tweakdefaults=
|
|
> EOF
|
|
|
|
$ hg init repo
|
|
$ echo a > repo/a
|
|
$ hg -R repo commit -qAm a
|
|
$ hg -R repo bookmark master
|
|
$ hg clone -q repo clone
|
|
$ cd clone
|
|
|
|
Pull --rebase with no local changes
|
|
$ hg bookmark localbookmark -t master
|
|
$ echo b > ../repo/b
|
|
$ hg -R ../repo commit -qAm b
|
|
$ hg pull --rebase
|
|
pulling from $TESTTMP/repo (glob)
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
new changesets d2ae7f538514
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
nothing to rebase - fast-forwarded to master
|
|
$ hg log -G -T "{rev} {desc}: {bookmarks}"
|
|
@ 1 b: localbookmark
|
|
|
|
|
o 0 a:
|
|
|
|
Make a local commit and check pull --rebase still works.
|
|
$ echo x > x
|
|
$ hg commit -qAm x
|
|
$ echo c > ../repo/c
|
|
$ hg -R ../repo commit -qAm c
|
|
$ hg pull --rebase
|
|
pulling from $TESTTMP/repo (glob)
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files (+1 heads)
|
|
new changesets 177f92b77385
|
|
rebasing 2:86d71924e1d0 "x" (localbookmark)
|
|
saved backup bundle to $TESTTMP/clone/.hg/strip-backup/86d71924e1d0-48875604-rebase.hg
|
|
$ hg log -G -T "{rev} {desc}: {bookmarks}"
|
|
@ 3 x: localbookmark
|
|
|
|
|
o 2 c:
|
|
|
|
|
o 1 b:
|
|
|
|
|
o 0 a:
|
|
|