随笔-repo sync 时自动切换当前分支的remote track分支的问题

https://blog.csdn.net/crylearner/article/details/38072373

确认repo代码位置：which repo

修改project.py:

diff --git a/project.py b/project.py
index 619cdfd..cefd534 100644
--- a/project.py
+++ b/project.py
@@ -1472,6 +1472,10 @@ class Project(object):
 
     # If the upstream switched on us, warn the user.
     #
+    if branch.merge != self.revisionExpr and branch.merge.split('/')[-1] != self.revisionExpr:
+      syncbuf.fail(self, "branch is not consistent: local %s, remote %s" %(branch.merge, self.revisionExpr))
+      return
+
     if branch.merge != self.revisionExpr:
       if branch.merge and self.revisionExpr:
         syncbuf.info(self,