equal
deleted
inserted
replaced
353 for b, scid, dcid in adddst: |
353 for b, scid, dcid in adddst: |
354 if b in explicit: |
354 if b in explicit: |
355 explicit.remove(b) |
355 explicit.remove(b) |
356 # treat as "deleted locally" |
356 # treat as "deleted locally" |
357 pushop.outbookmarks.append((b, dcid, '')) |
357 pushop.outbookmarks.append((b, dcid, '')) |
|
358 # identical bookmarks shouldn't get reported |
|
359 for b, scid, dcid in same: |
|
360 if b in explicit: |
|
361 explicit.remove(b) |
358 |
362 |
359 if explicit: |
363 if explicit: |
360 explicit = sorted(explicit) |
364 explicit = sorted(explicit) |
361 # we should probably list all of them |
365 # we should probably list all of them |
362 ui.warn(_('bookmark %s does not exist on the local ' |
366 ui.warn(_('bookmark %s does not exist on the local ' |