changeset 3505:74c7271a9f1b

reset workdir before pulling
author Han-Wen Nienhuys <hanwen@lilypond.org>
date Sat, 26 May 2007 16:51:02 -0300
parents 558cdd498826
children 5217e62fddc7
files gub/repository.py
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/gub/repository.py	Thu May 24 23:14:37 2007 -0300
+++ b/gub/repository.py	Sat May 26 16:51:02 2007 -0300
@@ -432,6 +432,7 @@
         revision = self.revision
         
         if os.path.isdir (os.path.join (destdir, self.vcs)):
+            self.git ('reset --hard HEAD' % locals (), dir=destdir)
             self.git ('pull %(repo_dir)s %(branch)s' % locals (), dir=destdir)
         else:
             self.system ('git-clone -l -s %(repo_dir)s %(destdir)s' % locals ())