commit cd7c5deca0b0594bd8addd5a0fe18b962d2679e9
author Anatol Pomazau <anatol@google.com> Tue Mar 20 13:45:00 2012 -0700
committer Shawn O. Pearce <sop@google.com> Tue Mar 20 14:11:56 2012 -0700
tree ec56d17e669c94bd297d8080f4f5bbb226a4841c
parent e02ac0af2e69f2c149de942d639bf305e5ae391a

Do not change branch.foo.merge in case of manifest sync

In case of manifest/smart sync repo changes ".merge" config
option from branch to SHA. Doing 'repo upload' fails as
repo tries to upload to a remote branch that looks like SHA
(e.g. refs/for/23423423423423423423423)

Do not update the .merge in case if revision is SHA.

Change-Id: I9139708fa17f21eec5a7e23c3255333626bf529e

project.py

diff --git a/project.py b/project.py
index 350a5e3..b80ad31 100644
--- a/project.py
+++ b/project.py
@@ -1102,7 +1102,9 @@
                    len(local_changes) - cnt_mine)
 
     branch.remote = self.GetRemote(self.remote.name)
-    branch.merge = self.revisionExpr
+    if not ID_RE.match(self.revisionExpr):
+      # in case of manifest sync the revisionExpr might be a SHA1
+      branch.merge = self.revisionExpr
     branch.Save()
 
     if cnt_mine > 0 and self.rebase: