[Pkg-ocaml-maint-commits] [SCM] dh-ocaml packaging branch, master, updated. debian/0.5.0-17-gfce4e39

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit fce4e3985ddf56178871ff8622afb75487cd667d
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Tue Jul 21 14:39:39 2009 +0000

    Give instructions if branch has diverge in dom-safe-pull.

diff --git a/tools/dom-safe-pull b/tools/dom-safe-pull
index 74492ff..e7cbdfb 100755
--- a/tools/dom-safe-pull
+++ b/tools/dom-safe-pull
@@ -54,7 +54,7 @@ sub update_if_fastforward ($) {
         if ($ours == 0) {
             system("git merge ${remote}") == 0 or die();
         } elsif ($theirs > 0) {
-            die "E: ${branch} has diverged from ${remote}, fix manually!\n";
+            die "E: ${branch} has diverged from ${remote}, fix manually!\nE: Maybe you should use 'git rebase ${remote}'\n";
         } else {
             print "I: ${branch} is ahead of ${remote} by ${ours} commits\n";
         }

-- 
dh-ocaml packaging