mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 00:45:18 +03:00
98d9269874
Summary: Create a fork of the Mercurial code that we can use to build server rpms. The hg servers will continue to exist for a few more months while we move the darkstorm and ediscovery use cases off them. In the mean time, we want to start making breaking changes to the client, so let's create a stable copy of the hg code to produce rpms for the hg servers. The fork is based off c7770c78d, the latest hg release. This copies the files as is, then adds some minor tweaks to get it to build: - Disables some lint checks that appear to be bypassed by path - sed replace eden/scm with eden/hg-server - Removed a dependency on scm/telemetry from the edenfs-client tests since scm/telemetry pulls in the original eden/scm/lib/configparser which conflicts with the hg-server conflict parser. allow-large-files Reviewed By: quark-zju Differential Revision: D27632557 fbshipit-source-id: b2f442f4ec000ea08e4d62de068750832198e1f4
101 lines
2.3 KiB
Python
101 lines
2.3 KiB
Python
# Copyright (c) Facebook, Inc. and its affiliates.
|
|
# Copyright (c) Mercurial Contributors.
|
|
#
|
|
# 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
|
|
|
|
|
|
# test that we don't interrupt the merge session if
|
|
# a file-level merge failed
|
|
|
|
sh % "hg init repo"
|
|
sh % "cd repo"
|
|
|
|
sh % "echo foo" > "foo"
|
|
sh % "echo a" > "bar"
|
|
sh % "hg ci -Am 'add foo'" == r"""
|
|
adding bar
|
|
adding foo"""
|
|
|
|
sh % "hg mv foo baz"
|
|
sh % "echo b" >> "bar"
|
|
sh % "echo quux" > "quux1"
|
|
sh % "hg ci -Am 'mv foo baz'" == "adding quux1"
|
|
|
|
sh % "hg up -qC 0"
|
|
sh % "echo" >> "foo"
|
|
sh % "echo c" >> "bar"
|
|
sh % "echo quux" > "quux2"
|
|
sh % "hg ci -Am 'change foo'" == "adding quux2"
|
|
|
|
# test with the rename on the remote side
|
|
sh % "'HGMERGE=false' hg merge" == r"""
|
|
merging bar
|
|
merging foo and baz to baz
|
|
merging bar failed!
|
|
1 files updated, 1 files merged, 0 files removed, 1 files unresolved
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
|
[1]"""
|
|
sh % "hg resolve -l" == r"""
|
|
U bar
|
|
R baz"""
|
|
|
|
# test with the rename on the local side
|
|
sh % "hg up -C 1" == "3 files updated, 0 files merged, 1 files removed, 0 files unresolved"
|
|
sh % "'HGMERGE=false' hg merge" == r"""
|
|
merging bar
|
|
merging baz and foo to baz
|
|
merging bar failed!
|
|
1 files updated, 1 files merged, 0 files removed, 1 files unresolved
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
|
[1]"""
|
|
|
|
# show unresolved
|
|
sh % "hg resolve -l" == r"""
|
|
U bar
|
|
R baz"""
|
|
|
|
# unmark baz
|
|
sh % "hg resolve -u baz"
|
|
|
|
# show
|
|
sh % "hg resolve -l" == r"""
|
|
U bar
|
|
U baz"""
|
|
sh % "hg st" == r"""
|
|
M bar
|
|
M baz
|
|
M quux2
|
|
? bar.orig"""
|
|
|
|
# re-resolve baz
|
|
sh % "hg resolve baz" == "merging baz and foo to baz"
|
|
|
|
# after resolve
|
|
sh % "hg resolve -l" == r"""
|
|
U bar
|
|
R baz"""
|
|
|
|
# resolve all warning
|
|
sh % "hg resolve" == r"""
|
|
abort: no files or directories specified
|
|
(use --all to re-merge all unresolved files)
|
|
[255]"""
|
|
|
|
# resolve all
|
|
sh % "hg resolve -a" == r"""
|
|
merging bar
|
|
warning: 1 conflicts while merging bar! (edit, then use 'hg resolve --mark')
|
|
[1]"""
|
|
|
|
# after
|
|
sh % "hg resolve -l" == r"""
|
|
U bar
|
|
R baz"""
|
|
|
|
sh % "cd .."
|