Show More
@@ -2111,11 +2111,22 b' class localrepository(repo.repository):' | |||||
2111 |
|
2111 | |||
2112 | added = [cl.node(r) for r in xrange(clstart, clend)] |
|
2112 | added = [cl.node(r) for r in xrange(clstart, clend)] | |
2113 | publishing = self.ui.configbool('phases', 'publish', True) |
|
2113 | publishing = self.ui.configbool('phases', 'publish', True) | |
2114 |
if |
|
2114 | if srctype == 'push': | |
2115 | # Old server can not push the boundary themself. |
|
2115 | # Old server can not push the boundary themself. | |
2116 |
# |
|
2116 | # New server won't push the boundary if changeset already | |
2117 | phases.advanceboundary(self, phases.public, added) |
|
2117 | # existed locally as secrete | |
2118 | elif srctype != 'strip': # strip should not touch boundary at all |
|
2118 | # | |
|
2119 | # We should not use added here but the list of all change in | |||
|
2120 | # the bundle | |||
|
2121 | if publishing: | |||
|
2122 | phases.advanceboundary(self, phases.public, srccontent) | |||
|
2123 | else: | |||
|
2124 | phases.advanceboundary(self, phases.draft, srccontent) | |||
|
2125 | phases.retractboundary(self, phases.draft, added) | |||
|
2126 | elif srctype != 'strip': | |||
|
2127 | # publishing only alter behavior during push | |||
|
2128 | # | |||
|
2129 | # strip should not touch boundary at all | |||
2119 | phases.retractboundary(self, phases.draft, added) |
|
2130 | phases.retractboundary(self, phases.draft, added) | |
2120 |
|
2131 | |||
2121 | # make changelog see real files again |
|
2132 | # make changelog see real files again |
@@ -795,6 +795,40 b' Discovery locally secret changeset on a ' | |||||
795 | o 0 public a-A - 054250a37db4 |
|
795 | o 0 public a-A - 054250a37db4 | |
796 |
|
796 | |||
797 |
|
797 | |||
|
798 | pushing a locally public and draft changesets remotly secret should make them appear on the remote side | |||
|
799 | ||||
|
800 | $ hg -R ../mu phase --secret --force 967b449fbc94 | |||
|
801 | $ hg push -r 435b5d83910c ../mu | |||
|
802 | pushing to ../mu | |||
|
803 | searching for changes | |||
|
804 | adding changesets | |||
|
805 | adding manifests | |||
|
806 | adding file changes | |||
|
807 | added 0 changesets with 0 changes to 2 files | |||
|
808 | $ hgph -R ../mu | |||
|
809 | o 10 draft A-secret - 435b5d83910c | |||
|
810 | | | |||
|
811 | o 9 public a-H - 967b449fbc94 | |||
|
812 | | | |||
|
813 | | o 8 public a-F - b740e3e5c05d | |||
|
814 | | | | |||
|
815 | | o 7 public a-E - e9f537e46dea | |||
|
816 | | | | |||
|
817 | +---o 6 public n-B - 145e75495359 | |||
|
818 | | | | |||
|
819 | o | 5 public n-A - d6bcb4f74035 | |||
|
820 | | | | |||
|
821 | | o 4 public a-D - b555f63b6063 | |||
|
822 | | | | |||
|
823 | | o 3 public a-C - 54acac6f23ab | |||
|
824 | | | | |||
|
825 | o | 2 public b-A - f54f1bb90ff3 | |||
|
826 | |/ | |||
|
827 | o 1 public a-B - 548a3d25dbf0 | |||
|
828 | | | |||
|
829 | o 0 public a-A - 054250a37db4 | |||
|
830 | ||||
|
831 | ||||
798 | pull new changeset with common draft locally |
|
832 | pull new changeset with common draft locally | |
799 |
|
833 | |||
800 | $ hg up -q 967b449fbc94 # create a new root for draft |
|
834 | $ hg up -q 967b449fbc94 # create a new root for draft |
General Comments 0
You need to be logged in to leave comments.
Login now