mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
432714c0bf
Summary: This happens in case of "pull --rebase" if the source is ancestor of destination Test Plan: see the new test, it's making hg crash without this change Reviewers: #fbhgext, ryanmce, simonfar Reviewed By: #fbhgext, ryanmce, simonfar Subscribers: ryanmce Differential Revision: https://phab.mercurial-scm.org/D436
50 lines
1.3 KiB
Perl
50 lines
1.3 KiB
Perl
$ . $TESTDIR/require-ext.sh remotenames
|
|
|
|
$ cat >> $HGRCPATH << EOF
|
|
> [ui]
|
|
> ssh=python "$TESTDIR/dummyssh"
|
|
> [extensions]
|
|
> perftweaks=$TESTDIR/../hgext3rd/perftweaks.py
|
|
> tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py
|
|
> remotenames=
|
|
> rebase=
|
|
> EOF
|
|
|
|
$ hg init master
|
|
$ cd master
|
|
$ echo a >> a && hg ci -Aqm a
|
|
$ hg book master
|
|
$ hg book -i
|
|
$ echo b >> b && hg ci -Aqm b
|
|
$ hg book foo
|
|
|
|
$ cd ..
|
|
$ hg clone ssh://user@dummy/master client -r 0
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
updating to branch default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
Verify pulling only some commits does not cause errors from the unpulled
|
|
remotenames
|
|
$ cd client
|
|
$ hg pull -r 0
|
|
pulling from ssh://user@dummy/master
|
|
no changes found
|
|
$ hg book --remote
|
|
default/master 0:cb9a9f314b8b
|
|
$ cat .hg/remotenames
|
|
cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b bookmarks default/master
|
|
|
|
$ hg pull --rebase -d master
|
|
pulling from ssh://user@dummy/master
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
(run 'hg update' to get a working copy)
|
|
nothing to rebase - working directory parent is also destination
|