Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=92529b5651483220fb26abcd8f9ded2f3f43b476
commit 92529b5651483220fb26abcd8f9ded2f3f43b476
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date: Sun Jun 8 14:54:02 2008 +0200
syncpkgcd: avoid conflict resolutions for git
- till now we tried to resolve conflicts and then we removed all conflict
markers
- now we just always reset to what the remote repo has
- this speeds up updaiting e.g. when switching between stable versions
diff --git a/syncpkgd/syncpkgcd.py b/syncpkgd/syncpkgcd.py
index 0c92566..a83d04f 100644
--- a/syncpkgd/syncpkgcd.py
+++ b/syncpkgd/syncpkgcd.py
@@ -119,8 +119,8 @@ class Syncpkgcd:
os.stat(tree)
os.chdir(tree)
if scm == "git":
- self.system("git pull")
- self.system("git checkout -f")
+ self.system("git fetch")
+ self.system("git reset --hard origin/master")
elif scm == "darcs":
self.system("darcs pull -a")
self.system("darcs revert -a")
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
