mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 08:18:15 +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
97 lines
3.0 KiB
Raku
97 lines
3.0 KiB
Raku
#chg-compatible
|
|
|
|
$ disable treemanifest
|
|
$ hg init
|
|
|
|
$ echo foo > a
|
|
$ echo foo > b
|
|
$ hg add a b
|
|
|
|
$ hg ci -m "test"
|
|
|
|
$ echo blah > a
|
|
|
|
$ hg ci -m "branch a"
|
|
|
|
$ hg co 'desc(test)'
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ echo blah > b
|
|
|
|
$ hg ci -m "branch b"
|
|
$ HGMERGE=true hg merge 96155394af80e900c1e01da6607cb913696d5782
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
|
|
$ hg ci -m "merge b/a -> blah"
|
|
|
|
$ hg co 96155394af80e900c1e01da6607cb913696d5782
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ HGMERGE=true hg merge 'max(desc(branch))'
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ hg ci -m "merge a/b -> blah"
|
|
|
|
$ hg log
|
|
commit: 2ee31f665a86
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: merge a/b -> blah
|
|
|
|
commit: e16a66a37edd
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: merge b/a -> blah
|
|
|
|
commit: 92cc4c306b19
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: branch b
|
|
|
|
commit: 96155394af80
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: branch a
|
|
|
|
commit: 5e0375449e74
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: test
|
|
|
|
$ hg debugindex --changelog
|
|
rev offset length ..... linkrev nodeid p1 p2 (re)
|
|
0 0 60 ..... 0 5e0375449e74 000000000000 000000000000 (re)
|
|
1 60 62 ..... 1 96155394af80 5e0375449e74 000000000000 (re)
|
|
2 122 62 ..... 2 92cc4c306b19 5e0375449e74 000000000000 (re)
|
|
3 184 69 ..... 3 e16a66a37edd 92cc4c306b19 96155394af80 (re)
|
|
4 253 69 ..... 4 2ee31f665a86 96155394af80 92cc4c306b19 (re)
|
|
|
|
revision 1
|
|
$ hg manifest --debug 96155394af80e900c1e01da6607cb913696d5782
|
|
79d7492df40aa0fa093ec4209be78043c181f094 644 a
|
|
2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 b
|
|
revision 2
|
|
$ hg manifest --debug 'max(desc(branch))'
|
|
2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 a
|
|
79d7492df40aa0fa093ec4209be78043c181f094 644 b
|
|
revision 3
|
|
$ hg manifest --debug e16a66a37edd20d849a93a9fb61e157d717fac36
|
|
79d7492df40aa0fa093ec4209be78043c181f094 644 a
|
|
79d7492df40aa0fa093ec4209be78043c181f094 644 b
|
|
revision 4
|
|
$ hg manifest --debug 'max(desc(merge))'
|
|
79d7492df40aa0fa093ec4209be78043c181f094 644 a
|
|
79d7492df40aa0fa093ec4209be78043c181f094 644 b
|
|
|
|
$ hg debugindex a
|
|
rev offset length ..... linkrev nodeid p1 p2 (re)
|
|
0 0 5 ..... 0 2ed2a3912a0b 000000000000 000000000000 (re)
|
|
1 5 6 ..... 1 79d7492df40a 2ed2a3912a0b 000000000000 (re)
|
|
|
|
$ hg verify
|
|
checking changesets
|
|
checking manifests
|
|
crosschecking files in changesets and manifests
|
|
checking files
|
|
2 files, 5 changesets, 4 total revisions
|