From: Felipe Contreras Date: Mon, 22 Apr 2013 21:55:16 GMT Subject: [PATCH 08/16] remote-hg: write tags in the appropriate branch Message-ID: <1366667724-567-9-git-send-email-felipe.contreras@gmail.com> In-Reply-To: <1366667724-567-1-git-send-email-felipe.contreras@gmail.com> Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index f5e4ba7..f685990 100755 --- a/contrib/remote-helpers/git-remote-hg +++ b/contrib/remote-helpers/git-remote-hg @@ -725,7 +725,9 @@ def parse_tag(parser): parsed_tags[name] = (tagger, data) def write_tag(repo, tag, node, msg, author): - tip = repo['tip'] + branch = repo[node].branch() + tip = branch_tip(repo, branch) + tip = repo[tip] def getfilectx(repo, memctx, f): try: @@ -744,7 +746,7 @@ def write_tag(repo, tag, node, msg, author): ctx = context.memctx(repo, (p1, p2), msg, ['.hgtags'], getfilectx, - user, (date, tz), {}) + user, (date, tz), {'branch' : branch}) tmp = encoding.encoding encoding.encoding = 'utf-8' -- 1.8.2.1.790.g4588561