summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2015-12-18 17:50:23 +0900
committerTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2015-12-18 17:52:50 +0900
commit00e8f346c31122fa8086055d39f2ea1ee2c35ab1 (patch)
tree1ebe6efa72a9422e102e52ee257eba869cfec4c2
parentd64da0cb16679f0791077ff5e1f9d03fa16a745f (diff)
downloadlorry-00e8f346c31122fa8086055d39f2ea1ee2c35ab1.tar.gz
Pass in -r before --force in hg-fast-export
HG lorries are currently broken with current versions of hg-fast-export Filed upstream bug here because it technically should not be broken: https://github.com/frej/fast-export/issues/57 Note the issue in the upstream git repository here: http://repo.or.cz/fast-export.git/blob/refs/heads/master:/hg-fast-export.sh#l54 This patch works around the issue by simply reordering the arguments of hg-fast-export in the lorry program. Change-Id: I2c8b303e2d90edb301186c0b3a6c57ba2e0b8179
-rwxr-xr-xlorry2
1 files changed, 1 insertions, 1 deletions
diff --git a/lorry b/lorry
index 7dfebee..78a2ef5 100755
--- a/lorry
+++ b/lorry
@@ -497,7 +497,7 @@ class Lorry(cliapp.Application):
self.run_program(['git', 'init', '--bare', gitdir])
self.progress('.. fast-exporting into git')
- self.run_program(['hg-fast-export', '--quiet', '--force', '-r', '../hg'],
+ self.run_program(['hg-fast-export', '-r', '../hg', '--quiet', '--force'],
cwd=gitdir)
def gitify_archive(self, archive_type, project_name, dirname, gitdir, spec):