facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

merge with crew-stable

Browse Source
This commit is contained in:
Thomas Arendsen Hein 2012-10-04 10:11:17 +02:00
commit 8ffc4bf2ff
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mercurial/hg.py
View File

@ -410,6 +410,8 @@ def clone(ui, peeropts, source, dest=None, pull=False, rev=None,
bn = destrepo[uprev].branch() bn = destrepo[uprev].branch()
destrepo.ui.status(_("updating to branch %s\n") % bn) destrepo.ui.status(_("updating to branch %s\n") % bn)
_update(destrepo, uprev) _update(destrepo, uprev)
if update in destrepo._bookmarks:
bookmarks.setcurrent(destrepo, update)
return srcpeer, destpeer return srcpeer, destpeer
finally: finally:

11
tests/test-bookmarks.t
View File

@ -349,6 +349,17 @@ test clone with a specific revision
$ hg -R cloned-bookmarks-rev bookmarks $ hg -R cloned-bookmarks-rev bookmarks
X2 1:925d80f479bb 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 create bundle with two heads
$ hg clone . tobundle $ hg clone . tobundle