jhbuild r2159 - in trunk: . jhbuild/versioncontrol

[malureau svn gnome org]

Author: malureau
Date: Tue Jul  1 19:46:31 2008
New Revision: 2159
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2159&view=rev

Log:
2008-06-28  Marc-Andre Lureau  <marcandre lureau gmail com>

	* jhbuild/versioncontrol/git.py (GitBranch._update): Also stash
	uncommitted changes for normal git, it's so nice.

Modified:
   trunk/ChangeLog
   trunk/jhbuild/versioncontrol/git.py

Modified: trunk/jhbuild/versioncontrol/git.py
==============================================================================
--- trunk/jhbuild/versioncontrol/git.py	(original)
+++ trunk/jhbuild/versioncontrol/git.py	Tue Jul  1 19:46:31 2008
@@ -174,6 +174,9 @@
         cwd = self.get_checkoutdir(copydir)
         buildscript.execute(['git', 'fetch'], 'git', cwd=cwd)
 
+        # stash uncommitted changes on the current branch
+        buildscript.execute(['git', 'stash', 'save', 'jhbuild-build'], 'git stash', cwd=self.get_checkoutdir())
+
         if self.config.sticky_date:
             commit = self._get_commit_from_date()
             branch = 'jhbuild-date-branch'