##// END OF EJS Templates
bookmarks: Avoid unconditional forwarding of bookmarks for the null revision...
Joel Rosdahl -
r7256:df800e00 default
parent child Browse files
Show More
@@ -19,7 +19,7 b' merge, hg update).'
19 from mercurial.commands import templateopts, hex, short
19 from mercurial.commands import templateopts, hex, short
20 from mercurial.i18n import _
20 from mercurial.i18n import _
21 from mercurial import cmdutil, util, commands, changelog
21 from mercurial import cmdutil, util, commands, changelog
22 from mercurial.node import nullrev
22 from mercurial.node import nullid, nullrev
23 from mercurial.repo import RepoError
23 from mercurial.repo import RepoError
24 import mercurial, mercurial.localrepo, mercurial.repair, os
24 import mercurial, mercurial.localrepo, mercurial.repair, os
25
25
@@ -182,6 +182,8 b' def reposetup(ui, repo):'
182 move the bookmark"""
182 move the bookmark"""
183 node = super(bookmark_repo, self).commit(*k, **kw)
183 node = super(bookmark_repo, self).commit(*k, **kw)
184 parents = repo.changelog.parents(node)
184 parents = repo.changelog.parents(node)
185 if parents[1] == nullid:
186 parents = (parents[0],)
185 marks = parse(repo)
187 marks = parse(repo)
186 update = False
188 update = False
187 for mark, n in marks.items():
189 for mark, n in marks.items():
General Comments 0
You need to be logged in to leave comments. Login now