# HG changeset patch
# Date 1276797014 -7200
# User David Soria Parra <dsp@php.net>
# Parent e291c039d8ec226ef1daf7b7cf3fdcbe95cde8bb
bookmarks: Warn if we have divergent bookmarks during push

diff --git a/hgext/bookmarks.py b/hgext/bookmarks.py
--- a/hgext/bookmarks.py
+++ b/hgext/bookmarks.py
@@ -322,6 +322,8 @@
                     if nr in self:
                         cr = self[nr]
                         cl = self[nl]
+                        if cl in cr.ancestors():
+                            continue
                         if cl in cr.descendants():
                             r = remote.pushkey('bookmarks', k, nr, nl)
                             if r:
@@ -329,6 +331,9 @@
                             else:
                                 self.ui.warn(_("failed to update bookmark"
                                                   " %s!\n") % k)
+                        else:
+                            self.ui.warn(_("not updating divergent"
+                                           " bookmark %s\n") % k)
 
             return result