Mercurial > hg > gut

comparison gut/main.py @ 10:6884a771ed54

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge the master
author Jeff Hammel <jhammel@mozilla.com>
date Wed, 21 Jul 2010 17:30:31 -0700
parents b344537797de
children 67b04f3c5032
comparison
equal deleted inserted replaced
9:b344537797de 10:6884a771ed54
72 call(['git', 'checkout', 'master']) 72 call(['git', 'checkout', 'master'])
73 call(['git', 'pull', 'origin', 'master']) 73 call(['git', 'pull', 'origin', 'master'])
74 if self.remote: 74 if self.remote:
75 call(['git', 'pull', self.remote, 'master']) 75 call(['git', 'pull', self.remote, 'master'])
76 call(['git', 'checkout', branch]) 76 call(['git', 'checkout', branch])
77 call(['git', 'merge', 'master'])
77 78
78 def feature(self, name): 79 def feature(self, name):
79 """make a new feature branch""" 80 """make a new feature branch"""
80 call(['git', 'checkout', 'master']) 81 call(['git', 'checkout', 'master'])
81 call(['git', 'checkout', '-b', name]) 82 call(['git', 'checkout', '-b', name])