mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 00:14:35 +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
144 lines
3.0 KiB
Perl
144 lines
3.0 KiB
Perl
#chg-compatible
|
|
|
|
|
|
Make sure that the internal merge tools (internal:fail, internal:local,
|
|
internal:union and internal:other) are used when matched by a
|
|
merge-pattern in hgrc
|
|
|
|
Make sure HGMERGE doesn't interfere with the test:
|
|
|
|
$ unset HGMERGE
|
|
|
|
$ hg init repo
|
|
$ cd repo
|
|
|
|
Initial file contents:
|
|
|
|
$ echo "line 1" > f
|
|
$ echo "line 2" >> f
|
|
$ echo "line 3" >> f
|
|
$ hg ci -Am "revision 0"
|
|
adding f
|
|
|
|
$ cat f
|
|
line 1
|
|
line 2
|
|
line 3
|
|
|
|
Branch 1: editing line 1:
|
|
|
|
$ sed 's/line 1/first line/' f > f.new
|
|
$ mv f.new f
|
|
$ hg ci -Am "edited first line"
|
|
|
|
Branch 2: editing line 3:
|
|
|
|
$ hg update 'desc(revision)'
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ sed 's/line 3/third line/' f > f.new
|
|
$ mv f.new f
|
|
$ hg ci -Am "edited third line"
|
|
|
|
Merge using internal:fail tool:
|
|
|
|
$ echo "[merge-patterns]" > .hg/hgrc
|
|
$ echo "* = internal:fail" >> .hg/hgrc
|
|
|
|
$ hg merge
|
|
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]
|
|
|
|
$ cat f
|
|
line 1
|
|
line 2
|
|
third line
|
|
|
|
$ hg stat
|
|
M f
|
|
|
|
Merge using internal:local tool:
|
|
|
|
$ hg update -C 'max(desc(edited))'
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ sed 's/internal:fail/internal:local/' .hg/hgrc > .hg/hgrc.new
|
|
$ mv .hg/hgrc.new .hg/hgrc
|
|
|
|
$ hg merge
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
|
|
$ cat f
|
|
line 1
|
|
line 2
|
|
third line
|
|
|
|
$ hg stat
|
|
M f
|
|
|
|
Merge using internal:other tool:
|
|
|
|
$ hg update -C 'max(desc(edited))'
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ sed 's/internal:local/internal:other/' .hg/hgrc > .hg/hgrc.new
|
|
$ mv .hg/hgrc.new .hg/hgrc
|
|
|
|
$ hg merge
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
|
|
$ cat f
|
|
first line
|
|
line 2
|
|
line 3
|
|
|
|
$ hg stat
|
|
M f
|
|
|
|
Merge using default tool:
|
|
|
|
$ hg update -C 'max(desc(edited))'
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ rm .hg/hgrc
|
|
|
|
$ hg merge
|
|
merging f
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
|
|
$ cat f
|
|
first line
|
|
line 2
|
|
third line
|
|
|
|
$ hg stat
|
|
M f
|
|
|
|
Merge using internal:union tool:
|
|
|
|
$ hg update -C 'max(desc(edited))'
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ echo "line 4a" >>f
|
|
$ hg ci -Am "Adding fourth line (commit 4)"
|
|
$ hg update 'max(desc(edited))'
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ echo "line 4b" >>f
|
|
$ hg ci -Am "Adding fourth line v2 (commit 5)"
|
|
|
|
$ echo "[merge-patterns]" > .hg/hgrc
|
|
$ echo "* = internal:union" >> .hg/hgrc
|
|
|
|
$ hg merge 2e6ee5e3ca9741adb8dea438cf4481288efd73c3
|
|
merging f
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
|
|
$ cat f
|
|
line 1
|
|
line 2
|
|
third line
|
|
line 4b
|
|
line 4a
|