comparison tests/test-phases-exchange.t @ 15891:249d3420ec9c

phases: move phase according what was pushed not only what was added added This fix the lack phase movement when a locally secret changeset without added children was pushed to the repository. In such case, this changeset would be present in the bundle source, but not in the ``added`` variable.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Fri, 13 Jan 2012 01:42:47 +0100
parents 816209eaf963
children 5653f2d166ea
comparison
equal deleted inserted replaced
15890:e234eda20984 15891:249d3420ec9c
793 o 1 public a-B - 548a3d25dbf0 793 o 1 public a-B - 548a3d25dbf0
794 | 794 |
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
801 $ mkcommit 'alpha-more' 835 $ mkcommit 'alpha-more'
802 created new head 836 created new head