mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 17:27:53 +03:00
b737973619
Summary: When the rebase destination has renamed a file, and copytrace failed to figure out anything useful, make it possible to manually input the rename destination. I'm using it to resolve conflicts caused by landing the bindings rename. Reviewed By: xavierd Differential Revision: D17367857 fbshipit-source-id: 55d9ed3a9641e40cc43518e9662fd803cbc00620
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 1: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 1:812796267395 "2"
|
|
merging 2 and 1 to 2
|
|
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/812796267395-81e11405-rebase.hg (glob)"""
|