Mercurial > bzezpatch

changeset 6:61a41c30ccae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase when pulling from foreign repo
author Atul Varma <avarma@mozilla.com>
date Wed, 02 Jun 2010 23:04:45 -0700
parents 14d152040c1d
children 7e455c3a7ad1
files bzezpatch/hg.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/bzezpatch/hg.py	Wed Jun 02 22:38:57 2010 -0700
+++ b/bzezpatch/hg.py	Wed Jun 02 23:04:45 2010 -0700
@@ -35,7 +35,7 @@
             # Step 4: Apply the patch by pulling from the foreign repo.
             out.write('pulling from %s\n' % pull_url)
             subprocess.check_call([self.hg, '-R', temp_repo, 'pull', pull_url,
-                                   '-u'],
+                                   '-u', '--rebase'],
                                   stdout=out, stderr=out)
 
             # Step 5: Generate a patch by diffing the tip of the