{"thread":{"id":"1983","subject":"[PATCH] archimport: Actually cope with merges from \"remote\" repositories. Plus: Nicer messages.","startedAt":"2005-09-30T07:15:12Z","lastAt":"2005-09-30T07:15:12Z","messageCount":1,"participants":["Martin Langhoff"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"9536","messageId":"11280645122296-git-send-email-martin@catalyst.net.nz","threadId":"1983","inReplyTo":null,"subject":"[PATCH] archimport: Actually cope with merges from \"remote\" repositories. Plus: Nicer messages.","fromName":"Martin Langhoff","fromEmail":"martin@catalyst.net.nz","sentAt":"2005-09-30T07:15:12Z","receivedAt":"2005-09-30T07:15:12Z","isPatch":true,"sender":{"key":"martin@laptop.org","avatar":null},"body":"archimport was refusing to import commits that had merges from repositories\nthat it didn't know about. Fixed.\n\nAlso brings in nicer messages.\n\nSigned-off-by: Martin Langhoff <martin@catalyst.net.nz>\n\n\n---\n\n git-archimport.perl |    8 +++++++-\n 1 files changed, 7 insertions(+), 1 deletions(-)\n\nd118e96e7f08fcd0963eac8d9e6f18e13f553a41\ndiff --git a/git-archimport.perl b/git-archimport.perl\n--- a/git-archimport.perl\n+++ b/git-archimport.perl\n@@ -228,10 +228,12 @@ foreach my $ps (@psets) {\n     # skip commits already in repo\n     #\n     if (ptag($ps->{id})) {\n-      $opt_v && print \"Skipping already imported: $ps->{id}\\n\";\n+      $opt_v && print \" * Skipping already imported: $ps->{id}\\n\";\n       next;\n     }\n \n+    print \" * Starting to work on $ps->{id}\\n\";\n+\n     # \n     # create the branch if needed\n     #\n@@ -675,6 +677,10 @@ sub find_parents {\n     # that branch.\n     #\n     foreach my $branch (keys %branches) {\n+\n+\t# check that we actually know about the branch\n+\tnext unless -e \"$git_dir/refs/heads/$branch\";\n+\n \tmy $mergebase = `git-merge-base $branch $ps->{branch}`;\n \tdie \"Cannot find merge base for $branch and $ps->{branch}\" if $?;\n \tchomp $mergebase;\n"}]}