Mercurial > hg > gut

comparison gut/main.py @ 12:67b04f3c5032 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dont pull from origin; there shouldnt be changes there use --rebase flag when pulling from master, dont know why
author Jeff Hammel <jhammel@mozilla.com>
date Fri, 06 Aug 2010 17:50:54 -0700
parents 6884a771ed54
children
comparison
equal deleted inserted replaced
11:68bf3598f364 12:67b04f3c5032
68 """update the master""" 68 """update the master"""
69 branch = self.branch() 69 branch = self.branch()
70 if self.simulate: 70 if self.simulate:
71 branch = '<branch>' 71 branch = '<branch>'
72 call(['git', 'checkout', 'master']) 72 call(['git', 'checkout', 'master'])
73 call(['git', 'pull', 'origin', 'master'])
74 if self.remote: 73 if self.remote:
75 call(['git', 'pull', self.remote, 'master']) 74 call(['git', 'pull', '--rebase', self.remote, 'master'])
76 call(['git', 'checkout', branch]) 75 call(['git', 'checkout', branch])
77 call(['git', 'merge', 'master']) 76 call(['git', 'merge', 'master'])
78 77
79 def feature(self, name): 78 def feature(self, name):
80 """make a new feature branch""" 79 """make a new feature branch"""