[or-cvs] [githax/master] The svn-revision filtering step must happen after show-ignore

[Nick Mathewson]

Author: Nick Mathewson <nickm at torproject.org>
Date: Fri, 25 Sep 2009 14:00:07 -0400
Subject: The svn-revision filtering step must happen after show-ignore
Commit: c244095d2a81cfd4bf5be70f09308fbfffeaa21b

---
 doc/svn-conversion |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/doc/svn-conversion b/doc/svn-conversion
index fc210c9..6a6ce31 100644
--- a/doc/svn-conversion
+++ b/doc/svn-conversion
@@ -21,6 +21,12 @@ git svn fetch --authors-file=$GITHAX/authors.txt
 # (This would be a good point to make a backup, so you don't have to
 #  do it all again if you mess up a later step.)
 
+# Set up a gitignore file
+git svn show-ignore > .gitignore
+vim .gitignore
+git add .gitignore
+git commit -m 'Add a gitignore file.'
+
 # Filter svn metadata to a prettier format
 git filter-branch --msg-filter '
         sed "s/^git-svn-id:[[:space:]]*[^[:space:]]*@\([[:digit:]]\{1,\}\)[[:space:]]*.*$/svn:r\1/"
@@ -49,13 +55,6 @@ git filter-branch --msg-filter '
 # Delete branches and tags that you don't want
 #   git branch -d badBranch
 
-# Set up a gitignore file
-git svn show-ignore > .gitignore
-vim .gitignore
-git add .gitignore
-git commit -m 'Add a gitignore file.'
-
-
 cd ..
 git clone --bare thandy_tmp thandy.git
 
-- 
1.5.6.5