From 00e8f346c31122fa8086055d39f2ea1ee2c35ab1 Mon Sep 17 00:00:00 2001 From: Tristan Van Berkom Date: Fri, 18 Dec 2015 17:50:23 +0900 Subject: 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 --- lorry | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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): -- cgit v1.2.1