mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 08:47:12 +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
47 lines
1.1 KiB
Perl
47 lines
1.1 KiB
Perl
#chg-compatible
|
|
|
|
$ hg init a
|
|
$ cd a
|
|
$ touch empty1
|
|
$ hg add empty1
|
|
$ hg commit -m 'add empty1'
|
|
|
|
$ touch empty2
|
|
$ hg add empty2
|
|
$ hg commit -m 'add empty2'
|
|
|
|
$ hg up -C 1e1d9c4e5b64028c36a7955c906c9a549cd0f523
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ touch empty3
|
|
$ hg add empty3
|
|
$ hg commit -m 'add empty3'
|
|
|
|
$ hg heads
|
|
commit: a1cb177e0d44
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: add empty3
|
|
|
|
commit: 097d2b0e17f6
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: add empty2
|
|
|
|
|
|
$ hg merge 097d2b0e17f6a1d7bfe479e1992ca2a243d22563
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
|
|
Before changeset 05257fd28591, we didn't notice the
|
|
empty file that came from rev 1:
|
|
|
|
$ hg status
|
|
M empty2
|
|
$ hg commit -m merge
|
|
$ hg manifest --debug tip
|
|
b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty1
|
|
b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty2
|
|
b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty3
|
|
|
|
$ cd ..
|