branch | stable |
changeset 23082 | 0fc4686de1d7 |
parent 23081 | e62c330a044f |
child 23139 | e53f6b72a0e4 |
child 23376 | 2e65da5f80df |
--- a/mercurial/exchange.py Fri Oct 24 10:40:37 2014 -0700 +++ b/mercurial/exchange.py Fri Oct 24 17:24:46 2014 -0500 @@ -355,6 +355,10 @@ explicit.remove(b) # treat as "deleted locally" pushop.outbookmarks.append((b, dcid, '')) + # identical bookmarks shouldn't get reported + for b, scid, dcid in same: + if b in explicit: + explicit.remove(b) if explicit: explicit = sorted(explicit)