mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 07:17:55 +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
94 lines
1.9 KiB
Perl
94 lines
1.9 KiB
Perl
$ setconfig extensions.treemanifest=!
|
|
Issue586: removing remote files after merge appears to corrupt the
|
|
dirstate
|
|
|
|
$ hg init a
|
|
$ cd a
|
|
$ echo a > a
|
|
$ hg ci -Ama
|
|
adding a
|
|
|
|
$ hg init ../b
|
|
$ cd ../b
|
|
$ echo b > b
|
|
$ hg ci -Amb
|
|
adding b
|
|
|
|
$ hg pull -f ../a
|
|
pulling from ../a
|
|
searching for changes
|
|
warning: repository is unrelated
|
|
requesting all changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files (+1 heads)
|
|
new changesets cb9a9f314b8b
|
|
$ hg merge
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ hg rm -f a
|
|
$ hg ci -Amc
|
|
|
|
$ hg st -A
|
|
C b
|
|
$ cd ..
|
|
|
|
Issue1433: Traceback after two unrelated pull, two move, a merge and
|
|
a commit (related to issue586)
|
|
|
|
create test repos
|
|
|
|
$ hg init repoa
|
|
$ touch repoa/a
|
|
$ hg -R repoa ci -Am adda
|
|
adding a
|
|
|
|
$ hg init repob
|
|
$ touch repob/b
|
|
$ hg -R repob ci -Am addb
|
|
adding b
|
|
|
|
$ hg init repoc
|
|
$ cd repoc
|
|
$ hg pull ../repoa
|
|
pulling from ../repoa
|
|
requesting all changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
new changesets 7132ab4568ac
|
|
$ hg update
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ mkdir tst
|
|
$ hg mv * tst
|
|
$ hg ci -m "import a in tst"
|
|
$ hg pull -f ../repob
|
|
pulling from ../repob
|
|
searching for changes
|
|
warning: repository is unrelated
|
|
requesting all changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files (+1 heads)
|
|
new changesets 5ddceb349652
|
|
|
|
merge both repos
|
|
|
|
$ hg merge
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ mkdir src
|
|
|
|
move b content
|
|
|
|
$ hg mv b src
|
|
$ hg ci -m "import b in src"
|
|
$ hg manifest
|
|
src/b
|
|
tst/a
|
|
|
|
$ cd ..
|