mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
merge with crew-stable
This commit is contained in:
commit
8ffc4bf2ff
@ -410,6 +410,8 @@ def clone(ui, peeropts, source, dest=None, pull=False, rev=None,
|
||||
bn = destrepo[uprev].branch()
|
||||
destrepo.ui.status(_("updating to branch %s\n") % bn)
|
||||
_update(destrepo, uprev)
|
||||
if update in destrepo._bookmarks:
|
||||
bookmarks.setcurrent(destrepo, update)
|
||||
|
||||
return srcpeer, destpeer
|
||||
finally:
|
||||
|
@ -349,6 +349,17 @@ test clone with a specific revision
|
||||
$ hg -R cloned-bookmarks-rev bookmarks
|
||||
X2 1:925d80f479bb
|
||||
|
||||
test clone with update to a bookmark
|
||||
|
||||
$ hg clone -u Z . cloned-bookmarks-update
|
||||
updating to branch default
|
||||
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
||||
$ hg -R cloned-bookmarks-update bookmarks
|
||||
X2 1:925d80f479bb
|
||||
Y 2:db815d6d32e6
|
||||
* Z 2:db815d6d32e6
|
||||
x y 2:db815d6d32e6
|
||||
|
||||
create bundle with two heads
|
||||
|
||||
$ hg clone . tobundle
|
||||
|
Loading…
Reference in New Issue
Block a user