[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesupport/emerge/bin/Source
From:       Andre Heinecke <aheinecke () intevation ! de>
Date:       2010-11-20 17:12:51
Message-ID: 20101120171251.17E1FAC8A0 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1199111 by aheinecke:

Revert r1199108 it created more problems then it solved. 


 M  +1 -1      GitSource.py  


--- trunk/kdesupport/emerge/bin/Source/GitSource.py #1199110:1199111
@@ -106,7 +106,7 @@
                     ret = self.shell.execute( self.checkoutDir(), "git", "checkout \
%s" % repoTag )  
             if ret and not repoTag:
-                ret = self.shell.execute( self.checkoutDir(), "git", "merge \
FETCH_HEAD %s" % self.__getCurrentBranch() ) +                ret = \
self.shell.execute( self.checkoutDir(), "git", "merge origin %s" % \
self.__getCurrentBranch() )  else:
             utils.debug( "skipping git fetch (--offline)" )
         return ret


[prev in list] [next in list] [prev in thread] [next in thread]