lorry: store the marks in the .git directory

The marks correspond to the import state of the git repository,
the .git directory is where the current state of the git repo is kept,
so it makes sense for the marks to be in there.

This is partly to allow the git state to be backed up before
a repository is processed in case it is left in an inconsistent state.

1 files changed, 2 insertions, 2 deletions

diff --git a/lorry b/lorry
index c3c7608..7135cea 100755
--- a/lorry
+++ b/lorry
@@ -224,7 +224,7 @@ class Lorry(cliapp.Application):
                                  cwd=branchdir)
 
         exports = {}
-        bzrmarks = os.path.join(dirname, 'marks.bzr')
+        bzrmarks = os.path.join(gitdir, '.git', 'marks.bzr')
         for branch, address in branches.iteritems():
             branchdir = os.path.join(bzrdir, branch)
             self.progress('.. fast-exporting branch %s from bzr' % branch)
@@ -237,7 +237,7 @@ class Lorry(cliapp.Application):
                 cmdline.append('--export-marks=' + bzrmarks)
             self.run_program(cmdline)
 
-        gitmarks = os.path.join(dirname, 'marks.git')
+        gitmarks = os.path.join(gitdir, '.git', 'marks.git')
         for branch, address in branches.iteritems():
             self.progress('.. fast-importing branch %s into git' % branch)
             with open(exports[branch], 'rb') as exportfile: