Show More
@@ -355,6 +355,10 b' def _pushdiscoverybookmarks(pushop):' | |||||
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) |
@@ -438,3 +438,29 b' pushing a new bookmark on a new head doe' | |||||
438 | cc978a373a53 tip W |
|
438 | cc978a373a53 tip W | |
439 |
|
439 | |||
440 | $ cd .. |
|
440 | $ cd .. | |
|
441 | ||||
|
442 | pushing an unchanged bookmark should result in no changes | |||
|
443 | ||||
|
444 | $ hg init unchanged-a | |||
|
445 | $ hg init unchanged-b | |||
|
446 | $ cd unchanged-a | |||
|
447 | $ echo initial > foo | |||
|
448 | $ hg commit -A -m initial | |||
|
449 | adding foo | |||
|
450 | $ hg bookmark @ | |||
|
451 | $ hg push -B @ ../unchanged-b | |||
|
452 | pushing to ../unchanged-b | |||
|
453 | searching for changes | |||
|
454 | adding changesets | |||
|
455 | adding manifests | |||
|
456 | adding file changes | |||
|
457 | added 1 changesets with 1 changes to 1 files | |||
|
458 | exporting bookmark @ | |||
|
459 | ||||
|
460 | $ hg push -B @ ../unchanged-b | |||
|
461 | pushing to ../unchanged-b | |||
|
462 | searching for changes | |||
|
463 | no changes found | |||
|
464 | [1] | |||
|
465 | ||||
|
466 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now