698 # exists locally as secret |
698 # exists locally as secret |
699 # |
699 # |
700 # We should not use added here but the list of all change in |
700 # We should not use added here but the list of all change in |
701 # the bundle |
701 # the bundle |
702 if publishing: |
702 if publishing: |
703 phases.advanceboundary(repo, phases.public, srccontent) |
703 phases.advanceboundary(repo, tr, phases.public, srccontent) |
704 else: |
704 else: |
705 # Those changesets have been pushed from the outside, their |
705 # Those changesets have been pushed from the outside, their |
706 # phases are going to be pushed alongside. Therefor |
706 # phases are going to be pushed alongside. Therefor |
707 # `targetphase` is ignored. |
707 # `targetphase` is ignored. |
708 phases.advanceboundary(repo, phases.draft, srccontent) |
708 phases.advanceboundary(repo, tr, phases.draft, srccontent) |
709 phases.retractboundary(repo, phases.draft, added) |
709 phases.retractboundary(repo, phases.draft, added) |
710 elif srctype != 'strip': |
710 elif srctype != 'strip': |
711 # publishing only alter behavior during push |
711 # publishing only alter behavior during push |
712 # |
712 # |
713 # strip should not touch boundary at all |
713 # strip should not touch boundary at all |