##// END OF EJS Templates
clone: make sure to use "@" as bookmark and "default" as branch (issue3677)...
Thomas Arendsen Hein -
r17867:c9339efe stable
parent child Browse files
Show More
@@ -409,14 +409,20 b' def clone(ui, peeropts, source, dest=Non'
409 if update:
409 if update:
410 if update is not True:
410 if update is not True:
411 checkout = srcpeer.lookup(update)
411 checkout = srcpeer.lookup(update)
412 for test in (checkout, '@', 'default', 'tip'):
412 uprev = None
413 if test is None:
413 if checkout is not None:
414 continue
415 try:
414 try:
416 uprev = destrepo.lookup(test)
415 uprev = destrepo.lookup(checkout)
417 break
418 except error.RepoLookupError:
416 except error.RepoLookupError:
419 continue
417 pass
418 if uprev is None:
419 try:
420 uprev = destrepo._bookmarks['@']
421 except KeyError:
422 try:
423 uprev = destrepo.branchtip('default')
424 except error.RepoLookupError:
425 uprev = destrepo.lookup('tip')
420 bn = destrepo[uprev].branch()
426 bn = destrepo[uprev].branch()
421 destrepo.ui.status(_("updating to branch %s\n") % bn)
427 destrepo.ui.status(_("updating to branch %s\n") % bn)
422 _update(destrepo, uprev)
428 _update(destrepo, uprev)
@@ -197,7 +197,6 b' r4 has hardlinks in the working dir (not'
197 2 r4/.hg/00changelog.i
197 2 r4/.hg/00changelog.i
198 2 r4/.hg/branch
198 2 r4/.hg/branch
199 2 r4/.hg/cache/branchheads
199 2 r4/.hg/cache/branchheads
200 2 r4/.hg/cache/tags
201 2 r4/.hg/dirstate
200 2 r4/.hg/dirstate
202 2 r4/.hg/hgrc
201 2 r4/.hg/hgrc
203 2 r4/.hg/last-message.txt
202 2 r4/.hg/last-message.txt
@@ -228,7 +227,6 b' Update back to revision 11 in r4 should '
228 2 r4/.hg/00changelog.i
227 2 r4/.hg/00changelog.i
229 1 r4/.hg/branch
228 1 r4/.hg/branch
230 2 r4/.hg/cache/branchheads
229 2 r4/.hg/cache/branchheads
231 2 r4/.hg/cache/tags
232 1 r4/.hg/dirstate
230 1 r4/.hg/dirstate
233 2 r4/.hg/hgrc
231 2 r4/.hg/hgrc
234 2 r4/.hg/last-message.txt
232 2 r4/.hg/last-message.txt
General Comments 0
You need to be logged in to leave comments. Login now