mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 16:57:49 +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
73 lines
1.9 KiB
Perl
73 lines
1.9 KiB
Perl
Load commonly used test logic
|
|
$ . "$TESTDIR/hggit/testutil"
|
|
|
|
$ hg init hgrepo1
|
|
$ cd hgrepo1
|
|
$ echo A > afile
|
|
$ hg add afile
|
|
$ hg ci -m "origin"
|
|
|
|
$ echo B > afile
|
|
$ hg ci -m "A->B"
|
|
|
|
$ hg up -r'desc(origin)'
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ echo C > afile
|
|
$ hg ci -m "A->C"
|
|
|
|
$ hg merge -r7205e83b5a3fb01334c76fef35a69c912f5b2ba3
|
|
merging afile
|
|
warning: 1 conflicts while merging afile! (edit, then use 'hg resolve --mark')
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
|
[1]
|
|
resolve using first parent
|
|
$ echo C > afile
|
|
$ hg resolve -m afile | egrep -v 'no more unresolved files' || true
|
|
$ hg ci -m "merge to C"
|
|
|
|
$ hg log --graph --style compact
|
|
@ 6c53bc0f062f 1970-01-01 00:00 +0000 test
|
|
├─╮ merge to C
|
|
│ │
|
|
│ o ea82b67264a1 1970-01-01 00:00 +0000 test
|
|
│ │ A->C
|
|
│ │
|
|
o │ 7205e83b5a3f 1970-01-01 00:00 +0000 test
|
|
├─╯ A->B
|
|
│
|
|
o 5d1a6b64f9d0 1970-01-01 00:00 +0000 test
|
|
origin
|
|
|
|
|
|
$ cd ..
|
|
|
|
$ git init -q --bare gitrepo
|
|
|
|
$ cd hgrepo1
|
|
$ hg bookmark -r tip master
|
|
$ hg push -r master ../gitrepo
|
|
pushing to ../gitrepo
|
|
searching for changes
|
|
adding objects
|
|
added 4 commits with 3 trees and 3 blobs
|
|
$ cd ..
|
|
|
|
$ hg clone gitrepo hgrepo2 | grep -v '^updating'
|
|
importing git objects into hg
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
expect the same revision ids as above
|
|
$ hg -R hgrepo2 log --graph --style compact
|
|
@ [master] b70d5f2ec3c4 1970-01-01 00:00 +0000 test
|
|
├─╮ merge to C
|
|
│ │
|
|
│ o 47fc555571b8 1970-01-01 00:00 +0000 test
|
|
│ │ A->B
|
|
│ │
|
|
o │ 8ec5b459b86e 1970-01-01 00:00 +0000 test
|
|
├─╯ A->C
|
|
│
|
|
o fd5eb788c3a1 1970-01-01 00:00 +0000 test
|
|
origin
|
|
|