##// END OF EJS Templates
unbundle: don't advance bookmarks (issue4322) (BC)...
Matt Mackall -
r22091:f72b71ba stable
parent child Browse files
Show More
@@ -5878,7 +5878,7 b' def unbundle(ui, repo, fname1, *fnames, '
5878 'bundle:' + fname)
5878 'bundle:' + fname)
5879 finally:
5879 finally:
5880 lock.release()
5880 lock.release()
5881 bookmarks.updatecurrentbookmark(repo, wc.node(), wc.branch())
5881
5882 return postincoming(ui, repo, modheads, opts.get('update'), None)
5882 return postincoming(ui, repo, modheads, opts.get('update'), None)
5883
5883
5884 @command('^update|up|checkout|co',
5884 @command('^update|up|checkout|co',
@@ -496,13 +496,12 b" update to current bookmark if it's not t"
496 parent: 2:db815d6d32e6
496 parent: 2:db815d6d32e6
497 2
497 2
498 branch: default
498 branch: default
499 bookmarks: [Z] Y x y
499 bookmarks: *Z Y x y
500 commit: 1 added, 1 unknown (new branch head)
500 commit: 1 added, 1 unknown (new branch head)
501 update: 2 new changesets (update)
501 update: 2 new changesets (update)
502 $ hg update
502 $ hg update
503 updating to active bookmark Z
504 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
503 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
505 (activating bookmark Z)
504 updating bookmark Z
506 $ hg bookmarks
505 $ hg bookmarks
507 X2 1:925d80f479bb
506 X2 1:925d80f479bb
508 Y 2:db815d6d32e6
507 Y 2:db815d6d32e6
General Comments 0
You need to be logged in to leave comments. Login now