|
@@ -67,11 +67,11 @@ def checkout(localRep, branch, force=True, progStream=None):
|
|
if progStream is None:
|
|
if progStream is None:
|
|
progStream = NoneStream()
|
|
progStream = NoneStream()
|
|
try:
|
|
try:
|
|
- porcelain.checkout_branch(r, 'origin/' + branch, force=force, outstream=progStream)
|
|
|
|
|
|
+ porcelain.checkout_branch(r, branch, force=force, outstream=progStream)
|
|
except porcelain.CheckoutError as e:
|
|
except porcelain.CheckoutError as e:
|
|
print("CheckoutError:", e)
|
|
print("CheckoutError:", e)
|
|
porcelain.fetch(localRep)
|
|
porcelain.fetch(localRep)
|
|
- porcelain.checkout_branch(r, 'origin/' + branch, force=force, outstream=progStream)
|
|
|
|
|
|
+ porcelain.checkout_branch(r, branch, force=force, outstream=progStream)
|
|
|
|
|
|
|
|
|
|
def pull(localRep, progStream=None, force=True, depth=3):
|
|
def pull(localRep, progStream=None, force=True, depth=3):
|
|
@@ -132,4 +132,4 @@ def swRemote_force(localRep, remote_url):
|
|
|
|
|
|
if __name__ == '__main__':
|
|
if __name__ == '__main__':
|
|
localrep = "/home/backup"
|
|
localrep = "/home/backup"
|
|
- log(localrep)
|
|
|
|
|
|
+ log(localrep)
|