mirror of
https://github.com/facebook/sapling.git
synced 2024-12-26 22:47:26 +03:00
db4849a0d6
Summary: These are passing, let's enable them. Reviewed By: quark-zju, singhsrb Differential Revision: D19676094 fbshipit-source-id: bcb363382d48a93ac62dceab2dd6349b910bb51a
44 lines
1.5 KiB
Python
44 lines
1.5 KiB
Python
# Copyright (c) Facebook, Inc. and its affiliates.
|
|
#
|
|
# This software may be used and distributed according to the terms of the
|
|
# GNU General Public License version 2 or any later version.
|
|
|
|
from __future__ import absolute_import
|
|
|
|
from testutil.dott import feature, sh, testtmp # noqa: F401
|
|
|
|
|
|
# TODO: Make this test compatibile with obsstore enabled.
|
|
sh % "setconfig 'experimental.evolution='"
|
|
|
|
sh % "cat" << r"""
|
|
[extensions]
|
|
rebase=
|
|
copytrace=
|
|
[experimental]
|
|
copytrace=off
|
|
""" >> "$HGRCPATH"
|
|
|
|
sh % "hg init repo"
|
|
sh % "cd repo"
|
|
sh % "echo 1" > "1"
|
|
sh % "hg add 1"
|
|
sh % "hg ci -m 1"
|
|
sh % "echo 2" > "1"
|
|
sh % "hg ci -m 2"
|
|
sh % "hg up 0" == "1 files updated, 0 files merged, 0 files removed, 0 files unresolved"
|
|
sh % "hg mv 1 2"
|
|
sh % "hg ci -m dest"
|
|
sh % "hg rebase -s 1 -d ." == r"""
|
|
rebasing 812796267395 "2"
|
|
other [source] changed 1 which local [dest] deleted
|
|
hint: if this is due to a renamed file, you can manually input the renamed path, or re-run the command using --config=experimental.copytrace=on to make hg figure out renamed path automatically (which is very slow, and you will need to be patient)
|
|
use (c)hanged version, leave (d)eleted, or leave (u)nresolved, or input (r)enamed path? u
|
|
unresolved conflicts (see hg resolve, then hg rebase --continue)
|
|
[1]"""
|
|
sh % "hg rebase --abort" == "rebase aborted"
|
|
sh % "hg rebase -s 1 -d . --config=experimental.copytrace=on" == r"""
|
|
rebasing 812796267395 "2"
|
|
merging 2 and 1 to 2
|
|
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/812796267395-81e11405-rebase.hg"""
|