Mercurial > public > mercurial-scm > hg
comparison mercurial/commands.py @ 22091:f72b71ba756b stable
unbundle: don't advance bookmarks (issue4322) (BC)
This behavior didn't make much sense and interacts badly with things
that use unbundle internally like shelve. Presumably, the original
rationale was that since bundles didn't contain bookmarks, this gave a
sense of keeping bookmarks up-to-date like would happen with a
corresponding pull. However, since it only updated the current active
bookmark, and bare update already did that anyway, this is pretty
slim.
Notably, the corresponding test actually works better without this
feature.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 10 Aug 2014 23:09:23 -0500 |
parents | dccbf52ffe9f |
children | fff8e1cec90f 42b1344656f7 |
comparison
equal
deleted
inserted
replaced
22089:1e392c63fb76 | 22091:f72b71ba756b |
---|---|
5876 gen = exchange.readbundle(ui, f, fname) | 5876 gen = exchange.readbundle(ui, f, fname) |
5877 modheads = changegroup.addchangegroup(repo, gen, 'unbundle', | 5877 modheads = changegroup.addchangegroup(repo, gen, 'unbundle', |
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', |
5885 [('C', 'clean', None, _('discard uncommitted changes (no backup)')), | 5885 [('C', 'clean', None, _('discard uncommitted changes (no backup)')), |
5886 ('c', 'check', None, | 5886 ('c', 'check', None, |