Support incremental pulling when some old patches were no-ops (e.g. e…

…mpty directory additions)
purcell · Sep 17, 2007 · 38670d8 · 38670d8
1 parent 5eb2249
commit 38670d8
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/darcs-to-git b/darcs-to-git
@@ -128,4 +128,12 @@ unless File.directory?("_darcs")
 end
 
 
-DarcsPatch.read_from_repo(SRCREPO).each { |patch| patch.pull_and_apply }
+patches = DarcsPatch.read_from_repo(SRCREPO)
+
+patches_to_pull = []
+while patch = patches.pop
+  break if patch.id_in_git_repo
+  patches_to_pull.unshift(patch)
+end
+
+patches_to_pull.each { |patch| patch.pull_and_apply }