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
59 lines
1.6 KiB
Perl
59 lines
1.6 KiB
Perl
#chg-compatible
|
|
|
|
https://bz.mercurial-scm.org/522
|
|
|
|
In the merge below, the file "foo" has the same contents in both
|
|
parents, but if we look at the file-level history, we'll notice that
|
|
the version in p1 is an ancestor of the version in p2. This test makes
|
|
sure that we'll use the version from p2 in the manifest of the merge
|
|
revision.
|
|
|
|
$ hg init repo
|
|
$ cd repo
|
|
|
|
$ echo foo > foo
|
|
$ hg ci -qAm 'add foo'
|
|
|
|
$ echo bar >> foo
|
|
$ hg ci -m 'change foo'
|
|
|
|
$ hg backout -r tip -m 'backout changed foo'
|
|
reverting foo
|
|
changeset 9eaf049ccce4 backs out changeset b515023e500e
|
|
|
|
$ hg up -C 'desc(add)'
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ touch bar
|
|
$ hg ci -qAm 'add bar'
|
|
|
|
$ hg merge --debug
|
|
searching for copies back to b515023e500e
|
|
unmatched files in local:
|
|
bar
|
|
resolving manifests
|
|
branchmerge: True, force: False, partial: False
|
|
ancestor: bbd179dfa0a7, local: 71766447bdbb+, remote: 9eaf049ccce4
|
|
foo: remote is newer -> g
|
|
getting foo
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
|
|
$ hg debugstate | grep foo
|
|
m 0 -2 unset foo
|
|
|
|
$ hg st -A foo
|
|
M foo
|
|
|
|
$ hg ci -m 'merge'
|
|
|
|
$ hg manifest --debug | grep foo
|
|
c6fc755d7e68f49f880599da29f15add41f42f5a 644 foo
|
|
|
|
$ hg debugindex foo
|
|
rev offset length ..... linkrev nodeid p1 p2 (re)
|
|
0 0 5 ..... 0 2ed2a3912a0b 000000000000 000000000000 (re)
|
|
1 5 9 ..... 1 6f4310b00b9a 2ed2a3912a0b 000000000000 (re)
|
|
2 14 5 ..... 2 c6fc755d7e68 6f4310b00b9a 000000000000 (re)
|
|
|