mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 07:17:55 +03:00
04f6795519
Summary: Named branches are going away. Remove the logic around it. Reviewed By: phillco Differential Revision: D13978575 fbshipit-source-id: d6e28d7cadffa612f74a2afc12800829d6113dfa
64 lines
1.6 KiB
Perl
64 lines
1.6 KiB
Perl
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
|
|
(run 'hg update' to get a working copy)
|
|
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
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
|
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:
|
|
|