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
156 lines
3.5 KiB
Perl
156 lines
3.5 KiB
Perl
#chg-compatible
|
|
|
|
|
|
$ hg init repo
|
|
$ cd repo
|
|
|
|
Revision 0:
|
|
|
|
$ echo "unchanged" > unchanged
|
|
$ echo "remove me" > remove
|
|
$ echo "copy me" > copy
|
|
$ echo "move me" > move
|
|
$ for i in 1 2 3 4 5 6 7 8 9; do
|
|
> echo "merge ok $i" >> zzz1_merge_ok
|
|
> done
|
|
$ echo "merge bad" > zzz2_merge_bad
|
|
$ hg ci -Am "revision 0"
|
|
adding copy
|
|
adding move
|
|
adding remove
|
|
adding unchanged
|
|
adding zzz1_merge_ok
|
|
adding zzz2_merge_bad
|
|
|
|
Revision 1:
|
|
|
|
$ hg rm remove
|
|
$ hg mv move moved
|
|
$ hg cp copy copied
|
|
$ echo "added" > added
|
|
$ hg add added
|
|
$ echo "new first line" > zzz1_merge_ok
|
|
$ hg cat zzz1_merge_ok >> zzz1_merge_ok
|
|
$ echo "new last line" >> zzz2_merge_bad
|
|
$ hg ci -m "revision 1"
|
|
|
|
Local changes to revision 0:
|
|
|
|
$ hg co c929647821fa73cdd20aa068da4153b2182c2731
|
|
4 files updated, 0 files merged, 3 files removed, 0 files unresolved
|
|
$ echo "new last line" >> zzz1_merge_ok
|
|
$ echo "another last line" >> zzz2_merge_bad
|
|
|
|
$ hg diff --nodates | grep "^[+-][^<>]"
|
|
--- a/zzz1_merge_ok
|
|
+++ b/zzz1_merge_ok
|
|
+new last line
|
|
--- a/zzz2_merge_bad
|
|
+++ b/zzz2_merge_bad
|
|
+another last line
|
|
|
|
$ hg st
|
|
M zzz1_merge_ok
|
|
M zzz2_merge_bad
|
|
|
|
Local merge with bad merge tool:
|
|
|
|
$ HGMERGE=false hg co
|
|
merging zzz1_merge_ok
|
|
merging zzz2_merge_bad
|
|
merging zzz2_merge_bad failed!
|
|
3 files updated, 1 files merged, 2 files removed, 1 files unresolved
|
|
use 'hg resolve' to retry unresolved file merges
|
|
[1]
|
|
|
|
$ hg resolve -m
|
|
(no more unresolved files)
|
|
|
|
$ hg co c929647821fa73cdd20aa068da4153b2182c2731
|
|
merging zzz1_merge_ok
|
|
merging zzz2_merge_bad
|
|
warning: 1 conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark')
|
|
2 files updated, 1 files merged, 3 files removed, 1 files unresolved
|
|
use 'hg resolve' to retry unresolved file merges
|
|
[1]
|
|
|
|
$ hg diff --nodates | grep "^[+-][^<>]"
|
|
--- a/zzz1_merge_ok
|
|
+++ b/zzz1_merge_ok
|
|
+new last line
|
|
--- a/zzz2_merge_bad
|
|
+++ b/zzz2_merge_bad
|
|
+another last line
|
|
+=======
|
|
|
|
$ hg st
|
|
M zzz1_merge_ok
|
|
M zzz2_merge_bad
|
|
? zzz2_merge_bad.orig
|
|
|
|
Local merge with conflicts:
|
|
|
|
$ hg resolve -m
|
|
(no more unresolved files)
|
|
|
|
$ hg co
|
|
merging zzz1_merge_ok
|
|
merging zzz2_merge_bad
|
|
warning: 1 conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark')
|
|
3 files updated, 1 files merged, 2 files removed, 1 files unresolved
|
|
use 'hg resolve' to retry unresolved file merges
|
|
[1]
|
|
|
|
$ hg resolve -m
|
|
(no more unresolved files)
|
|
|
|
$ hg co c929647821fa73cdd20aa068da4153b2182c2731 --config 'ui.origbackuppath=.hg/origbackups'
|
|
merging zzz1_merge_ok
|
|
merging zzz2_merge_bad
|
|
warning: 1 conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark')
|
|
2 files updated, 1 files merged, 3 files removed, 1 files unresolved
|
|
use 'hg resolve' to retry unresolved file merges
|
|
[1]
|
|
|
|
Are orig files from the last commit where we want them?
|
|
$ ls .hg/origbackups
|
|
zzz2_merge_bad
|
|
|
|
$ hg diff --nodates | grep "^[+-][^<>]"
|
|
--- a/zzz1_merge_ok
|
|
+++ b/zzz1_merge_ok
|
|
+new last line
|
|
--- a/zzz2_merge_bad
|
|
+++ b/zzz2_merge_bad
|
|
+another last line
|
|
+=======
|
|
+=======
|
|
+new last line
|
|
+=======
|
|
|
|
$ hg st
|
|
M zzz1_merge_ok
|
|
M zzz2_merge_bad
|
|
? zzz2_merge_bad.orig
|
|
|
|
Local merge without conflicts:
|
|
|
|
$ hg revert zzz2_merge_bad
|
|
|
|
$ hg resolve -m
|
|
(no more unresolved files)
|
|
|
|
$ hg co
|
|
merging zzz1_merge_ok
|
|
4 files updated, 1 files merged, 2 files removed, 0 files unresolved
|
|
|
|
$ hg diff --nodates | grep "^[+-][^<>]"
|
|
--- a/zzz1_merge_ok
|
|
+++ b/zzz1_merge_ok
|
|
+new last line
|
|
|
|
$ hg st
|
|
M zzz1_merge_ok
|
|
? zzz2_merge_bad.orig
|
|
|