mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 23:07:18 +03:00
a79204f0d6
Summary: See the previous diff for context. Those tests are migrated back via the script with some manual edits. test-remotenames-namespaces.t and test-remotenames-shared-repo.t have slightly different output between run-tests.py and hg debugruntest. I haven't tracked it down. For now, related lines are marked optional. Reviewed By: sggutier Differential Revision: D35102165 fbshipit-source-id: 75dc55e4d589db2e277dd38742b78c5bf4dceed4
38 lines
957 B
Perl
38 lines
957 B
Perl
#debugruntest-compatible
|
|
# Copyright (c) Meta Platforms, Inc. and affiliates.
|
|
#
|
|
# This software may be used and distributed according to the terms of the
|
|
# GNU General Public License version 2.
|
|
|
|
# Using modern setup
|
|
|
|
$ enable remotenames amend rebase
|
|
$ setconfig experimental.narrow-heads=true visibility.enabled=true mutation.record=true mutation.enabled=true "mutation.date=0 0" experimental.evolution= remotenames.rename.default=remote
|
|
|
|
# Test restack behavior with old stacks.
|
|
|
|
$ newrepo
|
|
$ drawdag << 'EOS'
|
|
> D2 # amend: D1 -> D2
|
|
> / # (This suggests a rebase from E1 to D2)
|
|
> M
|
|
> | E1
|
|
> | |
|
|
> | D1
|
|
> | |
|
|
> | | C1
|
|
> | |/
|
|
> | B1
|
|
> |/
|
|
> | B2 # amend: B1 -> B2
|
|
> |/ # (This suggests a rebase from C1 to B2)
|
|
> A
|
|
> EOS
|
|
$ hg debugremotebookmark master "$M"
|
|
$ hg up -q "$D2"
|
|
|
|
# Restack should not rebase C1 to B2, since the user is not on the B2 stack.
|
|
|
|
$ hg rebase --restack
|
|
rebasing 87d9afc4bc4e "E1"
|