mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 23:07:18 +03:00
1b6a04b2ec
This warning exists to prevent git users from prematurely polluting their namespace when trying out Mercurial. But for repos that already have multiple branches, understanding what branches are is not optional so we should just shut up.
105 lines
3.1 KiB
Perl
105 lines
3.1 KiB
Perl
$ hg init
|
|
$ echo foo > bar
|
|
$ hg commit -Am default
|
|
adding bar
|
|
$ hg up -r null
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ hg branch mine
|
|
marked working directory as branch mine
|
|
(branches are permanent and global, did you want a bookmark?)
|
|
$ echo hello > world
|
|
$ hg commit -Am hello
|
|
adding world
|
|
$ hg up -r null
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ hg branch other
|
|
marked working directory as branch other
|
|
$ echo good > bye
|
|
$ hg commit -Am other
|
|
adding bye
|
|
$ hg up -r mine
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
$ hg clone -U -u . .#other ../b -r 0 -r 1 -r 2 -b other
|
|
abort: cannot specify both --noupdate and --updaterev
|
|
[255]
|
|
|
|
$ hg clone -U .#other ../b -r 0 -r 1 -r 2 -b other
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 3 changesets with 3 changes to 3 files (+2 heads)
|
|
$ rm -rf ../b
|
|
|
|
$ hg clone -u . .#other ../b -r 0 -r 1 -r 2 -b other
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 3 changesets with 3 changes to 3 files (+2 heads)
|
|
updating to branch mine
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ rm -rf ../b
|
|
|
|
$ hg clone -u 0 .#other ../b -r 0 -r 1 -r 2 -b other
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 3 changesets with 3 changes to 3 files (+2 heads)
|
|
updating to branch default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ rm -rf ../b
|
|
|
|
$ hg clone -u 1 .#other ../b -r 0 -r 1 -r 2 -b other
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 3 changesets with 3 changes to 3 files (+2 heads)
|
|
updating to branch mine
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ rm -rf ../b
|
|
|
|
$ hg clone -u 2 .#other ../b -r 0 -r 1 -r 2 -b other
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 3 changesets with 3 changes to 3 files (+2 heads)
|
|
updating to branch other
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ rm -rf ../b
|
|
|
|
Test -r mine ... mine is ignored:
|
|
|
|
$ hg clone -u 2 .#other ../b -r mine -r 0 -r 1 -r 2 -b other
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 3 changesets with 3 changes to 3 files (+2 heads)
|
|
updating to branch other
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ rm -rf ../b
|
|
|
|
$ hg clone .#other ../b -b default -b mine
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 3 changesets with 3 changes to 3 files (+2 heads)
|
|
updating to branch default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ rm -rf ../b
|
|
|
|
$ hg clone .#other ../b
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
updating to branch other
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ rm -rf ../b
|
|
|
|
$ hg clone -U . ../c -r 1 -r 2 > /dev/null
|
|
$ hg clone ../c ../b
|
|
updating to branch other
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ rm -rf ../b ../c
|
|
|