##// END OF EJS Templates
clone: activate @ bookmark if updating to it...
Thomas Arendsen Hein -
r17870:7d2dd10c stable
parent child Browse files
Show More
@@ -418,6 +418,7 b' def clone(ui, peeropts, source, dest=Non'
418 if uprev is None:
418 if uprev is None:
419 try:
419 try:
420 uprev = destrepo._bookmarks['@']
420 uprev = destrepo._bookmarks['@']
421 update = '@'
421 except KeyError:
422 except KeyError:
422 try:
423 try:
423 uprev = destrepo.branchtip('default')
424 uprev = destrepo.branchtip('default')
@@ -338,7 +338,7 b' hgweb'
338 updating to branch default
338 updating to branch default
339 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
339 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
340 $ hg -R cloned-bookmarks bookmarks
340 $ hg -R cloned-bookmarks bookmarks
341 @ 1:9b140be10808
341 * @ 1:9b140be10808
342 X 1:9b140be10808
342 X 1:9b140be10808
343 Y 4:c922c0139ca0
343 Y 4:c922c0139ca0
344 Z 2:0d2164f0ce0d
344 Z 2:0d2164f0ce0d
@@ -377,6 +377,7 b' of this test.'
377 remote: adding manifests
377 remote: adding manifests
378 remote: adding file changes
378 remote: adding file changes
379 remote: added 1 changesets with 1 changes to 1 files
379 remote: added 1 changesets with 1 changes to 1 files
380 updating bookmark @ failed!
380 exporting bookmark add-foo
381 exporting bookmark add-foo
381
382
382 $ cd ..
383 $ cd ..
@@ -366,7 +366,7 b' test clone'
366 updating to branch default
366 updating to branch default
367 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
367 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
368 $ hg -R cloned-bookmarks bookmarks
368 $ hg -R cloned-bookmarks bookmarks
369 @ 2:db815d6d32e6
369 * @ 2:db815d6d32e6
370 X2 1:925d80f479bb
370 X2 1:925d80f479bb
371 Y 2:db815d6d32e6
371 Y 2:db815d6d32e6
372 Z 2:db815d6d32e6
372 Z 2:db815d6d32e6
@@ -384,7 +384,7 b' test clone with pull protocol'
384 updating to branch default
384 updating to branch default
385 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
385 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
386 $ hg -R cloned-bookmarks-pull bookmarks
386 $ hg -R cloned-bookmarks-pull bookmarks
387 @ 2:db815d6d32e6
387 * @ 2:db815d6d32e6
388 X2 1:925d80f479bb
388 X2 1:925d80f479bb
389 Y 2:db815d6d32e6
389 Y 2:db815d6d32e6
390 Z 2:db815d6d32e6
390 Z 2:db815d6d32e6
General Comments 0
You need to be logged in to leave comments. Login now