From 3379414b210d1c03c27b4b340c3a12da430ec2e9 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Wed, 29 Jun 2011 00:45:29 -0400 Subject: [PATCH] codereview: restrict sync to default branch 'default' is the name of the main branch, the one that isn't a release branch. R=golang-dev, r CC=golang-dev https://golang.org/cl/4636072 --- lib/codereview/codereview.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/codereview/codereview.py b/lib/codereview/codereview.py index 0b636c06a4f..385ac2c0687 100644 --- a/lib/codereview/codereview.py +++ b/lib/codereview/codereview.py @@ -1316,7 +1316,7 @@ def clpatch_or_undo(ui, repo, clname, opts, mode): # Create fresh CL and start with patch that would reverse the change. vers = short(rev.node()) cl = CL("new") - desc = rev.description() + desc = str(rev.description()) if mode == "undo": cl.desc = (undoHeader % (clname, vers)) + desc + undoFooter else: @@ -1783,7 +1783,7 @@ def sync(ui, repo, **opts): err = commands.postincoming(ui, repo, modheads, True, "tip") if err: return err - commands.update(ui, repo) + commands.update(ui, repo, rev="default") sync_changes(ui, repo) def sync_note(msg):