Skip to content

Commit 8d3b97a

Browse files
committed
Merge branch 'fc/remote-hg'
* fc/remote-hg: (50 commits) remote-hg: add support for --force remote-hg: add support for --dry-run remote-hg: check if a fetch is needed remote-hg: trivial cleanup remote-helpers: improve marks usage remote-hg: add check_push() helper remote-hg: add setup_big_push() helper remote-hg: remove files before modifications remote-hg: improve lightweight tag author remote-hg: use remote 'default' not local one remote-hg: improve branch listing remote-hg: simplify branch_tip() remote-hg: check diverged bookmarks remote-hg: pass around revision refs remote-hg: implement custom checkheads() remote-hg: implement custom push() remote-hg: only update necessary revisions remote-hg: force remote bookmark push selectively remote-hg: reorganize bookmark handling remote-hg: add test for failed double push ...
2 parents e936318 + c9eaef1 commit 8d3b97a

File tree

6 files changed

+1300
-522
lines changed

6 files changed

+1300
-522
lines changed

contrib/remote-helpers/git-remote-bzr

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,10 @@ class Marks:
116116
self.last_mark = mark
117117

118118
def get_tip(self, branch):
119-
return self.tips.get(branch, None)
119+
try:
120+
return str(self.tips[branch])
121+
except KeyError:
122+
return None
120123

121124
def set_tip(self, branch, tip):
122125
self.tips[branch] = tip

0 commit comments

Comments
 (0)