mirror of
https://github.com/facebook/sapling.git
synced 2024-10-12 01:39:21 +03:00
ad813edcbd
Summary: Now that all our repos are treemanifest, let's enable the extension by default in tests. Once we're certain no one needs it in production we'll also make it the default in core Mercurial. This diff includes a minor fix in treemanifest to be aware of always-enabled extensions. It won't matter until we actually add treemanifest to the list of default enabled extensions, but I caught this while testing things. Reviewed By: ikostia Differential Revision: D15030253 fbshipit-source-id: d8361f915928b6ad90665e6ed330c1df5c8d8d86
129 lines
3.0 KiB
Perl
129 lines
3.0 KiB
Perl
$ setconfig extensions.treemanifest=!
|
|
# A B
|
|
#
|
|
# 3 4 3
|
|
# |\/| |\
|
|
# |/\| | \
|
|
# 1 2 1 2
|
|
# \ / \ /
|
|
# 0 0
|
|
#
|
|
# if the result of the merge of 1 and 2
|
|
# is the same in 3 and 4, no new manifest
|
|
# will be created and the manifest group
|
|
# will be empty during the pull
|
|
#
|
|
# (plus we test a failure where outgoing
|
|
# wrongly reported the number of csets)
|
|
|
|
$ hg init a
|
|
$ cd a
|
|
$ touch init
|
|
$ hg ci -A -m 0
|
|
adding init
|
|
$ touch x y
|
|
$ hg ci -A -m 1
|
|
adding x
|
|
adding y
|
|
|
|
$ hg update 0
|
|
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
|
|
$ touch x y
|
|
$ hg ci -A -m 2
|
|
adding x
|
|
adding y
|
|
|
|
$ hg merge 1
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ hg ci -A -m m1
|
|
|
|
$ hg update -C 1
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg merge 2
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ hg ci -A -m m2
|
|
|
|
$ cd ..
|
|
|
|
$ hg clone -r 3 a b
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 4 changesets with 3 changes to 3 files
|
|
new changesets 5fcb73622933:d15a0c284984
|
|
updating to branch default
|
|
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ hg clone -r 4 a c
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 4 changesets with 3 changes to 3 files
|
|
new changesets 5fcb73622933:1ec3c74fc0e0
|
|
updating to branch default
|
|
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ hg -R a outgoing b
|
|
comparing with b
|
|
searching for changes
|
|
changeset: 4:1ec3c74fc0e0
|
|
tag: tip
|
|
parent: 1:79f9e10cd04e
|
|
parent: 2:8e1bb01c1a24
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: m2
|
|
|
|
$ hg -R a outgoing c
|
|
comparing with c
|
|
searching for changes
|
|
changeset: 3:d15a0c284984
|
|
parent: 2:8e1bb01c1a24
|
|
parent: 1:79f9e10cd04e
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: m1
|
|
|
|
$ hg -R b outgoing c
|
|
comparing with c
|
|
searching for changes
|
|
changeset: 3:d15a0c284984
|
|
tag: tip
|
|
parent: 2:8e1bb01c1a24
|
|
parent: 1:79f9e10cd04e
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: m1
|
|
|
|
$ hg -R c outgoing b
|
|
comparing with b
|
|
searching for changes
|
|
changeset: 3:1ec3c74fc0e0
|
|
tag: tip
|
|
parent: 1:79f9e10cd04e
|
|
parent: 2:8e1bb01c1a24
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: m2
|
|
|
|
|
|
$ hg -R b pull a
|
|
pulling from a
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 0 changes to 0 files (+1 heads)
|
|
new changesets 1ec3c74fc0e0
|
|
|
|
$ hg -R c pull a
|
|
pulling from a
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 0 changes to 0 files (+1 heads)
|
|
new changesets d15a0c284984
|