Mercurial > hg
annotate tests/test-phases-exchange.t @ 18190:d57879e72e18
zeroconf: use port from server instead of picking port from config (issue3746)
In order to get the port, wrap create server instead of
hgweb_mod/hgwebdir_mod.
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Sun, 30 Dec 2012 19:19:52 +0100 |
parents | f62ed3d90377 |
children | 3f5e75c22585 |
rev | line source |
---|---|
17565
f62ed3d90377
tests: enable even more Windows server tests
Patrick Mezard <patrick@mezard.eu>
parents:
17424
diff
changeset
|
1 $ "$TESTDIR/hghave" killdaemons || exit 80 |
16539
249542ded278
tests: skip new tests with requirements not available on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16535
diff
changeset
|
2 |
15484
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
3 $ cat >> $HGRCPATH <<EOF |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
4 > [extensions] |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
5 > graphlog= |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
6 > EOF |
16013
2a1d97630f7f
tests: don't use alias
Mads Kiilerich <mads@kiilerich.com>
parents:
15956
diff
changeset
|
7 $ hgph() { hg log -G --template "{rev} {phase} {desc} - {node|short}\n" $*; } |
15484
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
8 |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
9 $ mkcommit() { |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
10 > echo "$1" > "$1" |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
11 > hg add "$1" |
15713
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
12 > message="$1" |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
13 > shift |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
14 > hg ci -m "$message" $* |
15484
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
15 > } |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
16 |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
17 $ hg init alpha |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
18 $ cd alpha |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
19 $ mkcommit a-A |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
20 $ mkcommit a-B |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
21 $ mkcommit a-C |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
22 $ mkcommit a-D |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
23 $ hgph |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
24 @ 3 draft a-D - b555f63b6063 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
25 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
26 o 2 draft a-C - 54acac6f23ab |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
27 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
28 o 1 draft a-B - 548a3d25dbf0 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
29 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
30 o 0 draft a-A - 054250a37db4 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
31 |
15484
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
32 |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
33 $ hg init ../beta |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
34 $ hg push -r 1 ../beta |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
35 pushing to ../beta |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
36 searching for changes |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
37 adding changesets |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
38 adding manifests |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
39 adding file changes |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
40 added 2 changesets with 2 changes to 2 files |
15485
fa47291b3f1f
phases: mark content pushed as public in local repo on push
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15484
diff
changeset
|
41 $ hgph |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
42 @ 3 draft a-D - b555f63b6063 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
43 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
44 o 2 draft a-C - 54acac6f23ab |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
45 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
46 o 1 public a-B - 548a3d25dbf0 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
47 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
48 o 0 public a-A - 054250a37db4 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
49 |
15485
fa47291b3f1f
phases: mark content pushed as public in local repo on push
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15484
diff
changeset
|
50 |
15484
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
51 $ cd ../beta |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
52 $ hgph |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
53 o 1 public a-B - 548a3d25dbf0 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
54 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
55 o 0 public a-A - 054250a37db4 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
56 |
15484
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
57 $ hg up -q |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
58 $ mkcommit b-A |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
59 $ hgph |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
60 @ 2 draft b-A - f54f1bb90ff3 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
61 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
62 o 1 public a-B - 548a3d25dbf0 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
63 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
64 o 0 public a-A - 054250a37db4 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
65 |
15484
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
66 $ hg pull ../alpha |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
67 pulling from ../alpha |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
68 searching for changes |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
69 adding changesets |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
70 adding manifests |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
71 adding file changes |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
72 added 2 changesets with 2 changes to 2 files (+1 heads) |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
73 (run 'hg heads' to see heads, 'hg merge' to merge) |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
74 $ hgph |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
75 o 4 public a-D - b555f63b6063 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
76 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
77 o 3 public a-C - 54acac6f23ab |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
78 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
79 | @ 2 draft b-A - f54f1bb90ff3 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
80 |/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
81 o 1 public a-B - 548a3d25dbf0 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
82 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
83 o 0 public a-A - 054250a37db4 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
84 |
15484
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
85 |
15485
fa47291b3f1f
phases: mark content pushed as public in local repo on push
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15484
diff
changeset
|
86 pull did not updated ../alpha state. |
17424
e7cfe3587ea4
fix trivial spelling errors
Mads Kiilerich <mads@kiilerich.com>
parents:
16539
diff
changeset
|
87 push from alpha to beta should update phase even if nothing is transferred |
15484
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
88 |
15485
fa47291b3f1f
phases: mark content pushed as public in local repo on push
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15484
diff
changeset
|
89 $ cd ../alpha |
fa47291b3f1f
phases: mark content pushed as public in local repo on push
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15484
diff
changeset
|
90 $ hgph # not updated by remote pull |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
91 @ 3 draft a-D - b555f63b6063 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
92 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
93 o 2 draft a-C - 54acac6f23ab |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
94 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
95 o 1 public a-B - 548a3d25dbf0 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
96 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
97 o 0 public a-A - 054250a37db4 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
98 |
15485
fa47291b3f1f
phases: mark content pushed as public in local repo on push
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15484
diff
changeset
|
99 $ hg push ../beta |
fa47291b3f1f
phases: mark content pushed as public in local repo on push
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15484
diff
changeset
|
100 pushing to ../beta |
fa47291b3f1f
phases: mark content pushed as public in local repo on push
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15484
diff
changeset
|
101 searching for changes |
fa47291b3f1f
phases: mark content pushed as public in local repo on push
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15484
diff
changeset
|
102 no changes found |
16023
90f8b8dd0326
push: return 1 if no changes found (issue3228)
Matt Mackall <mpm@selenic.com>
parents:
16013
diff
changeset
|
103 [1] |
15485
fa47291b3f1f
phases: mark content pushed as public in local repo on push
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15484
diff
changeset
|
104 $ hgph |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
105 @ 3 public a-D - b555f63b6063 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
106 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
107 o 2 public a-C - 54acac6f23ab |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
108 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
109 o 1 public a-B - 548a3d25dbf0 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
110 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
111 o 0 public a-A - 054250a37db4 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
112 |
15485
fa47291b3f1f
phases: mark content pushed as public in local repo on push
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15484
diff
changeset
|
113 |
15486
1eefa4451c56
phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15485
diff
changeset
|
114 update must update phase of common changeset too |
1eefa4451c56
phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15485
diff
changeset
|
115 |
1eefa4451c56
phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15485
diff
changeset
|
116 $ hg pull ../beta # getting b-A |
1eefa4451c56
phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15485
diff
changeset
|
117 pulling from ../beta |
1eefa4451c56
phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15485
diff
changeset
|
118 searching for changes |
1eefa4451c56
phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15485
diff
changeset
|
119 adding changesets |
1eefa4451c56
phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15485
diff
changeset
|
120 adding manifests |
1eefa4451c56
phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15485
diff
changeset
|
121 adding file changes |
1eefa4451c56
phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15485
diff
changeset
|
122 added 1 changesets with 1 changes to 1 files (+1 heads) |
1eefa4451c56
phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15485
diff
changeset
|
123 (run 'hg heads' to see heads, 'hg merge' to merge) |
1eefa4451c56
phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15485
diff
changeset
|
124 |
1eefa4451c56
phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15485
diff
changeset
|
125 $ cd ../beta |
1eefa4451c56
phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15485
diff
changeset
|
126 $ hgph # not updated by remote pull |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
127 o 4 public a-D - b555f63b6063 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
128 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
129 o 3 public a-C - 54acac6f23ab |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
130 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
131 | @ 2 draft b-A - f54f1bb90ff3 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
132 |/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
133 o 1 public a-B - 548a3d25dbf0 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
134 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
135 o 0 public a-A - 054250a37db4 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
136 |
15486
1eefa4451c56
phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15485
diff
changeset
|
137 $ hg pull ../alpha |
1eefa4451c56
phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15485
diff
changeset
|
138 pulling from ../alpha |
1eefa4451c56
phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15485
diff
changeset
|
139 searching for changes |
1eefa4451c56
phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15485
diff
changeset
|
140 no changes found |
1eefa4451c56
phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15485
diff
changeset
|
141 $ hgph |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
142 o 4 public a-D - b555f63b6063 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
143 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
144 o 3 public a-C - 54acac6f23ab |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
145 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
146 | @ 2 public b-A - f54f1bb90ff3 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
147 |/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
148 o 1 public a-B - 548a3d25dbf0 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
149 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
150 o 0 public a-A - 054250a37db4 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
151 |
15486
1eefa4451c56
phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15485
diff
changeset
|
152 |
15646
218ec96c45d7
phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15486
diff
changeset
|
153 Publish configuration option |
218ec96c45d7
phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15486
diff
changeset
|
154 ---------------------------- |
15486
1eefa4451c56
phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15485
diff
changeset
|
155 |
15650
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
156 Pull |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
157 ```` |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
158 |
15646
218ec96c45d7
phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15486
diff
changeset
|
159 changegroup are added without phase movement |
218ec96c45d7
phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15486
diff
changeset
|
160 |
218ec96c45d7
phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15486
diff
changeset
|
161 $ hg bundle -a ../base.bundle |
218ec96c45d7
phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15486
diff
changeset
|
162 5 changesets found |
218ec96c45d7
phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15486
diff
changeset
|
163 $ cd .. |
218ec96c45d7
phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15486
diff
changeset
|
164 $ hg init mu |
218ec96c45d7
phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15486
diff
changeset
|
165 $ cd mu |
218ec96c45d7
phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15486
diff
changeset
|
166 $ cat > .hg/hgrc << EOF |
218ec96c45d7
phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15486
diff
changeset
|
167 > [phases] |
218ec96c45d7
phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15486
diff
changeset
|
168 > publish=0 |
218ec96c45d7
phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15486
diff
changeset
|
169 > EOF |
218ec96c45d7
phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15486
diff
changeset
|
170 $ hg unbundle ../base.bundle |
218ec96c45d7
phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15486
diff
changeset
|
171 adding changesets |
218ec96c45d7
phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15486
diff
changeset
|
172 adding manifests |
218ec96c45d7
phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15486
diff
changeset
|
173 adding file changes |
218ec96c45d7
phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15486
diff
changeset
|
174 added 5 changesets with 5 changes to 5 files (+1 heads) |
218ec96c45d7
phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15486
diff
changeset
|
175 (run 'hg heads' to see heads, 'hg merge' to merge) |
218ec96c45d7
phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15486
diff
changeset
|
176 $ hgph |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
177 o 4 draft a-D - b555f63b6063 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
178 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
179 o 3 draft a-C - 54acac6f23ab |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
180 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
181 | o 2 draft b-A - f54f1bb90ff3 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
182 |/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
183 o 1 draft a-B - 548a3d25dbf0 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
184 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
185 o 0 draft a-A - 054250a37db4 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
186 |
15647
ce193147f492
phases: update exchange test to include node hash.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15646
diff
changeset
|
187 $ cd .. |
15646
218ec96c45d7
phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15486
diff
changeset
|
188 |
15650
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
189 Pulling from publish=False to publish=False does not move boundary. |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
190 |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
191 $ hg init nu |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
192 $ cd nu |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
193 $ cat > .hg/hgrc << EOF |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
194 > [phases] |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
195 > publish=0 |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
196 > EOF |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
197 $ hg pull ../mu -r 54acac6f23ab |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
198 pulling from ../mu |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
199 adding changesets |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
200 adding manifests |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
201 adding file changes |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
202 added 3 changesets with 3 changes to 3 files |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
203 (run 'hg update' to get a working copy) |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
204 $ hgph |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
205 o 2 draft a-C - 54acac6f23ab |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
206 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
207 o 1 draft a-B - 548a3d25dbf0 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
208 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
209 o 0 draft a-A - 054250a37db4 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
210 |
15650
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
211 |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
212 Even for common |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
213 |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
214 $ hg pull ../mu -r f54f1bb90ff3 |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
215 pulling from ../mu |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
216 searching for changes |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
217 adding changesets |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
218 adding manifests |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
219 adding file changes |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
220 added 1 changesets with 1 changes to 1 files (+1 heads) |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
221 (run 'hg heads' to see heads, 'hg merge' to merge) |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
222 $ hgph |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
223 o 3 draft b-A - f54f1bb90ff3 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
224 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
225 | o 2 draft a-C - 54acac6f23ab |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
226 |/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
227 o 1 draft a-B - 548a3d25dbf0 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
228 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
229 o 0 draft a-A - 054250a37db4 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
230 |
15650
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
231 |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
232 |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
233 Pulling from Publish=True to Publish=False move boundary in common set. |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
234 we are in nu |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
235 |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
236 $ hg pull ../alpha -r b555f63b6063 |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
237 pulling from ../alpha |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
238 searching for changes |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
239 adding changesets |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
240 adding manifests |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
241 adding file changes |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
242 added 1 changesets with 1 changes to 1 files |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
243 (run 'hg update' to get a working copy) |
15956
5653f2d166ea
push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15891
diff
changeset
|
244 $ hgph # f54f1bb90ff3 stay draft, not ancestor of -r |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
245 o 4 public a-D - b555f63b6063 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
246 | |
15956
5653f2d166ea
push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15891
diff
changeset
|
247 | o 3 draft b-A - f54f1bb90ff3 |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
248 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
249 o | 2 public a-C - 54acac6f23ab |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
250 |/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
251 o 1 public a-B - 548a3d25dbf0 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
252 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
253 o 0 public a-A - 054250a37db4 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
254 |
15650
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
255 |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
256 pulling from Publish=False to publish=False with some public |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
257 |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
258 $ hg up -q f54f1bb90ff3 |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
259 $ mkcommit n-A |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
260 $ mkcommit n-B |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
261 $ hgph |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
262 @ 6 draft n-B - 145e75495359 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
263 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
264 o 5 draft n-A - d6bcb4f74035 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
265 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
266 | o 4 public a-D - b555f63b6063 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
267 | | |
15956
5653f2d166ea
push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15891
diff
changeset
|
268 o | 3 draft b-A - f54f1bb90ff3 |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
269 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
270 | o 2 public a-C - 54acac6f23ab |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
271 |/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
272 o 1 public a-B - 548a3d25dbf0 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
273 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
274 o 0 public a-A - 054250a37db4 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
275 |
15650
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
276 $ cd ../mu |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
277 $ hg pull ../nu |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
278 pulling from ../nu |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
279 searching for changes |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
280 adding changesets |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
281 adding manifests |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
282 adding file changes |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
283 added 2 changesets with 2 changes to 2 files |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
284 (run 'hg update' to get a working copy) |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
285 $ hgph |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
286 o 6 draft n-B - 145e75495359 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
287 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
288 o 5 draft n-A - d6bcb4f74035 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
289 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
290 | o 4 public a-D - b555f63b6063 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
291 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
292 | o 3 public a-C - 54acac6f23ab |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
293 | | |
15956
5653f2d166ea
push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15891
diff
changeset
|
294 o | 2 draft b-A - f54f1bb90ff3 |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
295 |/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
296 o 1 public a-B - 548a3d25dbf0 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
297 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
298 o 0 public a-A - 054250a37db4 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
299 |
15650
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
300 $ cd .. |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
301 |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
302 pulling into publish=True |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
303 |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
304 $ cd alpha |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
305 $ hgph |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
306 o 4 public b-A - f54f1bb90ff3 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
307 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
308 | @ 3 public a-D - b555f63b6063 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
309 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
310 | o 2 public a-C - 54acac6f23ab |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
311 |/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
312 o 1 public a-B - 548a3d25dbf0 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
313 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
314 o 0 public a-A - 054250a37db4 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
315 |
15650
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
316 $ hg pull ../mu |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
317 pulling from ../mu |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
318 searching for changes |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
319 adding changesets |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
320 adding manifests |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
321 adding file changes |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
322 added 2 changesets with 2 changes to 2 files |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
323 (run 'hg update' to get a working copy) |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
324 $ hgph |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
325 o 6 draft n-B - 145e75495359 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
326 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
327 o 5 draft n-A - d6bcb4f74035 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
328 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
329 o 4 public b-A - f54f1bb90ff3 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
330 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
331 | @ 3 public a-D - b555f63b6063 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
332 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
333 | o 2 public a-C - 54acac6f23ab |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
334 |/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
335 o 1 public a-B - 548a3d25dbf0 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
336 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
337 o 0 public a-A - 054250a37db4 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
338 |
15650
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
339 $ cd .. |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
340 |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
341 pulling back into original repo |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
342 |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
343 $ cd nu |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
344 $ hg pull ../alpha |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
345 pulling from ../alpha |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
346 searching for changes |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
347 no changes found |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
348 $ hgph |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
349 @ 6 public n-B - 145e75495359 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
350 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
351 o 5 public n-A - d6bcb4f74035 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
352 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
353 | o 4 public a-D - b555f63b6063 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
354 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
355 o | 3 public b-A - f54f1bb90ff3 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
356 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
357 | o 2 public a-C - 54acac6f23ab |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
358 |/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
359 o 1 public a-B - 548a3d25dbf0 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
360 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
361 o 0 public a-A - 054250a37db4 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
362 |
15651
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
363 |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
364 Push |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
365 ```` |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
366 |
15659
7fba5a245acc
phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15651
diff
changeset
|
367 (inserted) |
7fba5a245acc
phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15651
diff
changeset
|
368 |
7fba5a245acc
phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15651
diff
changeset
|
369 Test that phase are pushed even when they are nothing to pus |
7fba5a245acc
phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15651
diff
changeset
|
370 (this might be tested later bu are very convenient to not alter too much test) |
7fba5a245acc
phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15651
diff
changeset
|
371 |
7fba5a245acc
phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15651
diff
changeset
|
372 Push back to alpha |
7fba5a245acc
phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15651
diff
changeset
|
373 |
7fba5a245acc
phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15651
diff
changeset
|
374 $ hg push ../alpha # from nu |
7fba5a245acc
phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15651
diff
changeset
|
375 pushing to ../alpha |
7fba5a245acc
phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15651
diff
changeset
|
376 searching for changes |
7fba5a245acc
phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15651
diff
changeset
|
377 no changes found |
16023
90f8b8dd0326
push: return 1 if no changes found (issue3228)
Matt Mackall <mpm@selenic.com>
parents:
16013
diff
changeset
|
378 [1] |
15659
7fba5a245acc
phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15651
diff
changeset
|
379 $ cd .. |
7fba5a245acc
phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15651
diff
changeset
|
380 $ cd alpha |
7fba5a245acc
phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15651
diff
changeset
|
381 $ hgph |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
382 o 6 public n-B - 145e75495359 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
383 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
384 o 5 public n-A - d6bcb4f74035 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
385 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
386 o 4 public b-A - f54f1bb90ff3 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
387 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
388 | @ 3 public a-D - b555f63b6063 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
389 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
390 | o 2 public a-C - 54acac6f23ab |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
391 |/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
392 o 1 public a-B - 548a3d25dbf0 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
393 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
394 o 0 public a-A - 054250a37db4 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
395 |
15659
7fba5a245acc
phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15651
diff
changeset
|
396 |
7fba5a245acc
phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15651
diff
changeset
|
397 (end insertion) |
7fba5a245acc
phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15651
diff
changeset
|
398 |
7fba5a245acc
phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15651
diff
changeset
|
399 |
15651
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
400 initial setup |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
401 |
15659
7fba5a245acc
phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15651
diff
changeset
|
402 $ hg glog # of alpha |
15651
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
403 o changeset: 6:145e75495359 |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
404 | tag: tip |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
405 | user: test |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
406 | date: Thu Jan 01 00:00:00 1970 +0000 |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
407 | summary: n-B |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
408 | |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
409 o changeset: 5:d6bcb4f74035 |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
410 | user: test |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
411 | date: Thu Jan 01 00:00:00 1970 +0000 |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
412 | summary: n-A |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
413 | |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
414 o changeset: 4:f54f1bb90ff3 |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
415 | parent: 1:548a3d25dbf0 |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
416 | user: test |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
417 | date: Thu Jan 01 00:00:00 1970 +0000 |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
418 | summary: b-A |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
419 | |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
420 | @ changeset: 3:b555f63b6063 |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
421 | | user: test |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
422 | | date: Thu Jan 01 00:00:00 1970 +0000 |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
423 | | summary: a-D |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
424 | | |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
425 | o changeset: 2:54acac6f23ab |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
426 |/ user: test |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
427 | date: Thu Jan 01 00:00:00 1970 +0000 |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
428 | summary: a-C |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
429 | |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
430 o changeset: 1:548a3d25dbf0 |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
431 | user: test |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
432 | date: Thu Jan 01 00:00:00 1970 +0000 |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
433 | summary: a-B |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
434 | |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
435 o changeset: 0:054250a37db4 |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
436 user: test |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
437 date: Thu Jan 01 00:00:00 1970 +0000 |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
438 summary: a-A |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
439 |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
440 $ mkcommit a-E |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
441 $ mkcommit a-F |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
442 $ mkcommit a-G |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
443 $ hg up d6bcb4f74035 -q |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
444 $ mkcommit a-H |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
445 created new head |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
446 $ hgph |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
447 @ 10 draft a-H - 967b449fbc94 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
448 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
449 | o 9 draft a-G - 3e27b6f1eee1 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
450 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
451 | o 8 draft a-F - b740e3e5c05d |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
452 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
453 | o 7 draft a-E - e9f537e46dea |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
454 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
455 +---o 6 public n-B - 145e75495359 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
456 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
457 o | 5 public n-A - d6bcb4f74035 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
458 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
459 o | 4 public b-A - f54f1bb90ff3 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
460 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
461 | o 3 public a-D - b555f63b6063 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
462 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
463 | o 2 public a-C - 54acac6f23ab |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
464 |/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
465 o 1 public a-B - 548a3d25dbf0 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
466 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
467 o 0 public a-A - 054250a37db4 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
468 |
15651
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
469 |
16195
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
470 Pulling from bundle does not alter phases of changeset not present in the bundle |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
471 |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
472 $ hg bundle --base 1 -r 6 -r 3 ../partial-bundle.hg |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
473 5 changesets found |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
474 $ hg pull ../partial-bundle.hg |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
475 pulling from ../partial-bundle.hg |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
476 searching for changes |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
477 no changes found |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
478 $ hgph |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
479 @ 10 draft a-H - 967b449fbc94 |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
480 | |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
481 | o 9 draft a-G - 3e27b6f1eee1 |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
482 | | |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
483 | o 8 draft a-F - b740e3e5c05d |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
484 | | |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
485 | o 7 draft a-E - e9f537e46dea |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
486 | | |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
487 +---o 6 public n-B - 145e75495359 |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
488 | | |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
489 o | 5 public n-A - d6bcb4f74035 |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
490 | | |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
491 o | 4 public b-A - f54f1bb90ff3 |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
492 | | |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
493 | o 3 public a-D - b555f63b6063 |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
494 | | |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
495 | o 2 public a-C - 54acac6f23ab |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
496 |/ |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
497 o 1 public a-B - 548a3d25dbf0 |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
498 | |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
499 o 0 public a-A - 054250a37db4 |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
500 |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
501 |
15651
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
502 Pushing to Publish=False (unknown changeset) |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
503 |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
504 $ hg push ../mu -r b740e3e5c05d # a-F |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
505 pushing to ../mu |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
506 searching for changes |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
507 adding changesets |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
508 adding manifests |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
509 adding file changes |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
510 added 2 changesets with 2 changes to 2 files |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
511 $ hgph |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
512 @ 10 draft a-H - 967b449fbc94 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
513 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
514 | o 9 draft a-G - 3e27b6f1eee1 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
515 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
516 | o 8 draft a-F - b740e3e5c05d |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
517 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
518 | o 7 draft a-E - e9f537e46dea |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
519 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
520 +---o 6 public n-B - 145e75495359 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
521 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
522 o | 5 public n-A - d6bcb4f74035 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
523 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
524 o | 4 public b-A - f54f1bb90ff3 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
525 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
526 | o 3 public a-D - b555f63b6063 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
527 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
528 | o 2 public a-C - 54acac6f23ab |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
529 |/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
530 o 1 public a-B - 548a3d25dbf0 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
531 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
532 o 0 public a-A - 054250a37db4 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
533 |
15651
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
534 |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
535 $ cd ../mu |
15956
5653f2d166ea
push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15891
diff
changeset
|
536 $ hgph # again f54f1bb90ff3, d6bcb4f74035 and 145e75495359 stay draft, |
5653f2d166ea
push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15891
diff
changeset
|
537 > # not ancestor of -r |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
538 o 8 draft a-F - b740e3e5c05d |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
539 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
540 o 7 draft a-E - e9f537e46dea |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
541 | |
15956
5653f2d166ea
push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15891
diff
changeset
|
542 | o 6 draft n-B - 145e75495359 |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
543 | | |
15956
5653f2d166ea
push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15891
diff
changeset
|
544 | o 5 draft n-A - d6bcb4f74035 |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
545 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
546 o | 4 public a-D - b555f63b6063 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
547 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
548 o | 3 public a-C - 54acac6f23ab |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
549 | | |
15956
5653f2d166ea
push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15891
diff
changeset
|
550 | o 2 draft b-A - f54f1bb90ff3 |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
551 |/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
552 o 1 public a-B - 548a3d25dbf0 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
553 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
554 o 0 public a-A - 054250a37db4 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
555 |
15651
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
556 |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
557 Pushing to Publish=True (unknown changeset) |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
558 |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
559 $ hg push ../beta -r b740e3e5c05d |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
560 pushing to ../beta |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
561 searching for changes |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
562 adding changesets |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
563 adding manifests |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
564 adding file changes |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
565 added 2 changesets with 2 changes to 2 files |
15956
5653f2d166ea
push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15891
diff
changeset
|
566 $ hgph # again f54f1bb90ff3, d6bcb4f74035 and 145e75495359 stay draft, |
5653f2d166ea
push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15891
diff
changeset
|
567 > # not ancestor of -r |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
568 o 8 public a-F - b740e3e5c05d |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
569 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
570 o 7 public a-E - e9f537e46dea |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
571 | |
15956
5653f2d166ea
push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15891
diff
changeset
|
572 | o 6 draft n-B - 145e75495359 |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
573 | | |
15956
5653f2d166ea
push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15891
diff
changeset
|
574 | o 5 draft n-A - d6bcb4f74035 |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
575 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
576 o | 4 public a-D - b555f63b6063 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
577 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
578 o | 3 public a-C - 54acac6f23ab |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
579 | | |
15956
5653f2d166ea
push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15891
diff
changeset
|
580 | o 2 draft b-A - f54f1bb90ff3 |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
581 |/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
582 o 1 public a-B - 548a3d25dbf0 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
583 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
584 o 0 public a-A - 054250a37db4 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
585 |
15651
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
586 |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
587 Pushing to Publish=True (common changeset) |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
588 |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
589 $ cd ../beta |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
590 $ hg push ../alpha |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
591 pushing to ../alpha |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
592 searching for changes |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
593 no changes found |
16023
90f8b8dd0326
push: return 1 if no changes found (issue3228)
Matt Mackall <mpm@selenic.com>
parents:
16013
diff
changeset
|
594 [1] |
15651
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
595 $ hgph |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
596 o 6 public a-F - b740e3e5c05d |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
597 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
598 o 5 public a-E - e9f537e46dea |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
599 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
600 o 4 public a-D - b555f63b6063 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
601 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
602 o 3 public a-C - 54acac6f23ab |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
603 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
604 | @ 2 public b-A - f54f1bb90ff3 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
605 |/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
606 o 1 public a-B - 548a3d25dbf0 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
607 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
608 o 0 public a-A - 054250a37db4 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
609 |
15651
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
610 $ cd ../alpha |
15956
5653f2d166ea
push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15891
diff
changeset
|
611 $ hgph |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
612 @ 10 draft a-H - 967b449fbc94 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
613 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
614 | o 9 draft a-G - 3e27b6f1eee1 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
615 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
616 | o 8 public a-F - b740e3e5c05d |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
617 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
618 | o 7 public a-E - e9f537e46dea |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
619 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
620 +---o 6 public n-B - 145e75495359 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
621 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
622 o | 5 public n-A - d6bcb4f74035 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
623 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
624 o | 4 public b-A - f54f1bb90ff3 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
625 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
626 | o 3 public a-D - b555f63b6063 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
627 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
628 | o 2 public a-C - 54acac6f23ab |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
629 |/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
630 o 1 public a-B - 548a3d25dbf0 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
631 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
632 o 0 public a-A - 054250a37db4 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
633 |
15651
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
634 |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
635 Pushing to Publish=False (common changeset that change phase + unknown one) |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
636 |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
637 $ hg push ../mu -r 967b449fbc94 -f |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
638 pushing to ../mu |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
639 searching for changes |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
640 adding changesets |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
641 adding manifests |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
642 adding file changes |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
643 added 1 changesets with 1 changes to 1 files (+1 heads) |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
644 $ hgph |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
645 @ 10 draft a-H - 967b449fbc94 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
646 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
647 | o 9 draft a-G - 3e27b6f1eee1 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
648 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
649 | o 8 public a-F - b740e3e5c05d |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
650 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
651 | o 7 public a-E - e9f537e46dea |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
652 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
653 +---o 6 public n-B - 145e75495359 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
654 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
655 o | 5 public n-A - d6bcb4f74035 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
656 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
657 o | 4 public b-A - f54f1bb90ff3 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
658 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
659 | o 3 public a-D - b555f63b6063 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
660 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
661 | o 2 public a-C - 54acac6f23ab |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
662 |/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
663 o 1 public a-B - 548a3d25dbf0 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
664 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
665 o 0 public a-A - 054250a37db4 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
666 |
15651
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
667 $ cd ../mu |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
668 $ hgph # d6bcb4f74035 should have changed phase |
15956
5653f2d166ea
push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15891
diff
changeset
|
669 > # 145e75495359 is still draft. not ancestor of -r |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
670 o 9 draft a-H - 967b449fbc94 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
671 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
672 | o 8 public a-F - b740e3e5c05d |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
673 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
674 | o 7 public a-E - e9f537e46dea |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
675 | | |
15956
5653f2d166ea
push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15891
diff
changeset
|
676 +---o 6 draft n-B - 145e75495359 |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
677 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
678 o | 5 public n-A - d6bcb4f74035 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
679 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
680 | o 4 public a-D - b555f63b6063 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
681 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
682 | o 3 public a-C - 54acac6f23ab |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
683 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
684 o | 2 public b-A - f54f1bb90ff3 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
685 |/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
686 o 1 public a-B - 548a3d25dbf0 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
687 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
688 o 0 public a-A - 054250a37db4 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
689 |
15651
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
690 |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
691 |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
692 Pushing to Publish=True (common changeset from publish=False) |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
693 |
15713
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
694 (in mu) |
15651
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
695 $ hg push ../alpha |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
696 pushing to ../alpha |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
697 searching for changes |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
698 no changes found |
16023
90f8b8dd0326
push: return 1 if no changes found (issue3228)
Matt Mackall <mpm@selenic.com>
parents:
16013
diff
changeset
|
699 [1] |
15651
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
700 $ hgph |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
701 o 9 public a-H - 967b449fbc94 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
702 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
703 | o 8 public a-F - b740e3e5c05d |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
704 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
705 | o 7 public a-E - e9f537e46dea |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
706 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
707 +---o 6 public n-B - 145e75495359 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
708 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
709 o | 5 public n-A - d6bcb4f74035 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
710 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
711 | o 4 public a-D - b555f63b6063 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
712 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
713 | o 3 public a-C - 54acac6f23ab |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
714 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
715 o | 2 public b-A - f54f1bb90ff3 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
716 |/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
717 o 1 public a-B - 548a3d25dbf0 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
718 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
719 o 0 public a-A - 054250a37db4 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
720 |
15651
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
721 $ hgph -R ../alpha # a-H should have been synced to 0 |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
722 @ 10 public a-H - 967b449fbc94 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
723 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
724 | o 9 draft a-G - 3e27b6f1eee1 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
725 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
726 | o 8 public a-F - b740e3e5c05d |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
727 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
728 | o 7 public a-E - e9f537e46dea |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
729 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
730 +---o 6 public n-B - 145e75495359 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
731 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
732 o | 5 public n-A - d6bcb4f74035 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
733 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
734 o | 4 public b-A - f54f1bb90ff3 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
735 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
736 | o 3 public a-D - b555f63b6063 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
737 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
738 | o 2 public a-C - 54acac6f23ab |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
739 |/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
740 o 1 public a-B - 548a3d25dbf0 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
741 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
742 o 0 public a-A - 054250a37db4 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
743 |
15651
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
744 |
15713
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
745 |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
746 Discovery locally secret changeset on a remote repository: |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
747 |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
748 - should make it non-secret |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
749 |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
750 $ cd ../alpha |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
751 $ mkcommit A-secret --config phases.new-commit=2 |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
752 $ hgph |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
753 @ 11 secret A-secret - 435b5d83910c |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
754 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
755 o 10 public a-H - 967b449fbc94 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
756 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
757 | o 9 draft a-G - 3e27b6f1eee1 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
758 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
759 | o 8 public a-F - b740e3e5c05d |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
760 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
761 | o 7 public a-E - e9f537e46dea |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
762 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
763 +---o 6 public n-B - 145e75495359 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
764 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
765 o | 5 public n-A - d6bcb4f74035 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
766 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
767 o | 4 public b-A - f54f1bb90ff3 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
768 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
769 | o 3 public a-D - b555f63b6063 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
770 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
771 | o 2 public a-C - 54acac6f23ab |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
772 |/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
773 o 1 public a-B - 548a3d25dbf0 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
774 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
775 o 0 public a-A - 054250a37db4 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
776 |
15713
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
777 $ hg bundle --base 'parents(.)' -r . ../secret-bundle.hg |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
778 1 changesets found |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
779 $ hg -R ../mu unbundle ../secret-bundle.hg |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
780 adding changesets |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
781 adding manifests |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
782 adding file changes |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
783 added 1 changesets with 1 changes to 1 files |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
784 (run 'hg update' to get a working copy) |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
785 $ hgph -R ../mu |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
786 o 10 draft A-secret - 435b5d83910c |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
787 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
788 o 9 public a-H - 967b449fbc94 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
789 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
790 | o 8 public a-F - b740e3e5c05d |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
791 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
792 | o 7 public a-E - e9f537e46dea |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
793 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
794 +---o 6 public n-B - 145e75495359 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
795 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
796 o | 5 public n-A - d6bcb4f74035 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
797 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
798 | o 4 public a-D - b555f63b6063 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
799 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
800 | o 3 public a-C - 54acac6f23ab |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
801 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
802 o | 2 public b-A - f54f1bb90ff3 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
803 |/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
804 o 1 public a-B - 548a3d25dbf0 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
805 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
806 o 0 public a-A - 054250a37db4 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
807 |
15713
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
808 $ hg pull ../mu |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
809 pulling from ../mu |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
810 searching for changes |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
811 no changes found |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
812 $ hgph |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
813 @ 11 draft A-secret - 435b5d83910c |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
814 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
815 o 10 public a-H - 967b449fbc94 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
816 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
817 | o 9 draft a-G - 3e27b6f1eee1 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
818 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
819 | o 8 public a-F - b740e3e5c05d |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
820 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
821 | o 7 public a-E - e9f537e46dea |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
822 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
823 +---o 6 public n-B - 145e75495359 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
824 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
825 o | 5 public n-A - d6bcb4f74035 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
826 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
827 o | 4 public b-A - f54f1bb90ff3 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
828 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
829 | o 3 public a-D - b555f63b6063 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
830 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
831 | o 2 public a-C - 54acac6f23ab |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
832 |/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
833 o 1 public a-B - 548a3d25dbf0 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
834 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
835 o 0 public a-A - 054250a37db4 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
836 |
15889
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
837 |
16535
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16195
diff
changeset
|
838 pushing a locally public and draft changesets remotly secret should make them |
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16195
diff
changeset
|
839 appear on the remote side. |
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16195
diff
changeset
|
840 |
15891
249d3420ec9c
phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15889
diff
changeset
|
841 |
249d3420ec9c
phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15889
diff
changeset
|
842 $ hg -R ../mu phase --secret --force 967b449fbc94 |
249d3420ec9c
phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15889
diff
changeset
|
843 $ hg push -r 435b5d83910c ../mu |
249d3420ec9c
phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15889
diff
changeset
|
844 pushing to ../mu |
249d3420ec9c
phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15889
diff
changeset
|
845 searching for changes |
16535
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16195
diff
changeset
|
846 abort: push creates new remote head 435b5d83910c! |
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16195
diff
changeset
|
847 (did you forget to merge? use push -f to force) |
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16195
diff
changeset
|
848 [255] |
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16195
diff
changeset
|
849 $ hg push -fr 435b5d83910c ../mu # because the push will create new visible head |
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16195
diff
changeset
|
850 pushing to ../mu |
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16195
diff
changeset
|
851 searching for changes |
15891
249d3420ec9c
phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15889
diff
changeset
|
852 adding changesets |
249d3420ec9c
phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15889
diff
changeset
|
853 adding manifests |
249d3420ec9c
phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15889
diff
changeset
|
854 adding file changes |
249d3420ec9c
phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15889
diff
changeset
|
855 added 0 changesets with 0 changes to 2 files |
249d3420ec9c
phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15889
diff
changeset
|
856 $ hgph -R ../mu |
249d3420ec9c
phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15889
diff
changeset
|
857 o 10 draft A-secret - 435b5d83910c |
249d3420ec9c
phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15889
diff
changeset
|
858 | |
249d3420ec9c
phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15889
diff
changeset
|
859 o 9 public a-H - 967b449fbc94 |
249d3420ec9c
phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15889
diff
changeset
|
860 | |
249d3420ec9c
phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15889
diff
changeset
|
861 | o 8 public a-F - b740e3e5c05d |
249d3420ec9c
phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15889
diff
changeset
|
862 | | |
249d3420ec9c
phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15889
diff
changeset
|
863 | o 7 public a-E - e9f537e46dea |
249d3420ec9c
phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15889
diff
changeset
|
864 | | |
249d3420ec9c
phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15889
diff
changeset
|
865 +---o 6 public n-B - 145e75495359 |
249d3420ec9c
phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15889
diff
changeset
|
866 | | |
249d3420ec9c
phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15889
diff
changeset
|
867 o | 5 public n-A - d6bcb4f74035 |
249d3420ec9c
phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15889
diff
changeset
|
868 | | |
249d3420ec9c
phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15889
diff
changeset
|
869 | o 4 public a-D - b555f63b6063 |
249d3420ec9c
phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15889
diff
changeset
|
870 | | |
249d3420ec9c
phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15889
diff
changeset
|
871 | o 3 public a-C - 54acac6f23ab |
249d3420ec9c
phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15889
diff
changeset
|
872 | | |
249d3420ec9c
phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15889
diff
changeset
|
873 o | 2 public b-A - f54f1bb90ff3 |
249d3420ec9c
phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15889
diff
changeset
|
874 |/ |
249d3420ec9c
phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15889
diff
changeset
|
875 o 1 public a-B - 548a3d25dbf0 |
249d3420ec9c
phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15889
diff
changeset
|
876 | |
249d3420ec9c
phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15889
diff
changeset
|
877 o 0 public a-A - 054250a37db4 |
249d3420ec9c
phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15889
diff
changeset
|
878 |
249d3420ec9c
phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15889
diff
changeset
|
879 |
15889
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
880 pull new changeset with common draft locally |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
881 |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
882 $ hg up -q 967b449fbc94 # create a new root for draft |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
883 $ mkcommit 'alpha-more' |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
884 created new head |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
885 $ hg push -fr . ../mu |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
886 pushing to ../mu |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
887 searching for changes |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
888 adding changesets |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
889 adding manifests |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
890 adding file changes |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
891 added 1 changesets with 1 changes to 1 files (+1 heads) |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
892 $ cd ../mu |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
893 $ hg phase --secret --force 1c5cfd894796 |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
894 $ hg up -q 435b5d83910c |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
895 $ mkcommit 'mu-more' |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
896 $ cd ../alpha |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
897 $ hg pull ../mu |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
898 pulling from ../mu |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
899 searching for changes |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
900 adding changesets |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
901 adding manifests |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
902 adding file changes |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
903 added 1 changesets with 1 changes to 1 files |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
904 (run 'hg update' to get a working copy) |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
905 $ hgph |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
906 o 13 draft mu-more - 5237fb433fc8 |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
907 | |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
908 | @ 12 draft alpha-more - 1c5cfd894796 |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
909 | | |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
910 o | 11 draft A-secret - 435b5d83910c |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
911 |/ |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
912 o 10 public a-H - 967b449fbc94 |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
913 | |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
914 | o 9 draft a-G - 3e27b6f1eee1 |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
915 | | |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
916 | o 8 public a-F - b740e3e5c05d |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
917 | | |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
918 | o 7 public a-E - e9f537e46dea |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
919 | | |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
920 +---o 6 public n-B - 145e75495359 |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
921 | | |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
922 o | 5 public n-A - d6bcb4f74035 |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
923 | | |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
924 o | 4 public b-A - f54f1bb90ff3 |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
925 | | |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
926 | o 3 public a-D - b555f63b6063 |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
927 | | |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
928 | o 2 public a-C - 54acac6f23ab |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
929 |/ |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
930 o 1 public a-B - 548a3d25dbf0 |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
931 | |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
932 o 0 public a-A - 054250a37db4 |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
933 |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
934 |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
935 Test that test are properly ignored on remote event when existing locally |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
936 |
15740
62aa9305399d
phases: copy phases data on local clone
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15713
diff
changeset
|
937 $ cd .. |
15889
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
938 $ hg clone -qU -r b555f63b6063 -r f54f1bb90ff3 beta gamma |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
939 |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
940 # pathological case are |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
941 # |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
942 # * secret remotely |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
943 # * known locally |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
944 # * repo have uncommon changeset |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
945 |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
946 $ hg -R beta phase --secret --force f54f1bb90ff3 |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
947 $ hg -R gamma phase --draft --force f54f1bb90ff3 |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
948 |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
949 $ cd gamma |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
950 $ hg pull ../beta |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
951 pulling from ../beta |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
952 searching for changes |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
953 adding changesets |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
954 adding manifests |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
955 adding file changes |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
956 added 2 changesets with 2 changes to 2 files |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
957 (run 'hg update' to get a working copy) |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
958 $ hg phase f54f1bb90ff3 |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
959 2: draft |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
960 |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
961 same over the wire |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
962 |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
963 $ cd ../beta |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
964 $ hg serve -p $HGPORT -d --pid-file=../beta.pid -E ../beta-error.log |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
965 $ cat ../beta.pid >> $DAEMON_PIDS |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
966 $ cd ../gamma |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
967 |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
968 $ hg pull http://localhost:$HGPORT/ |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
969 pulling from http://localhost:$HGPORT/ |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
970 searching for changes |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
971 no changes found |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
972 $ hg phase f54f1bb90ff3 |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
973 2: draft |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
974 |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
975 check that secret local on both side are not synced to public |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
976 |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
977 $ hg push -r b555f63b6063 http://localhost:$HGPORT/ |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
978 pushing to http://localhost:$HGPORT/ |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
979 searching for changes |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
980 no changes found |
16023
90f8b8dd0326
push: return 1 if no changes found (issue3228)
Matt Mackall <mpm@selenic.com>
parents:
16013
diff
changeset
|
981 [1] |
15889
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
982 $ hg phase f54f1bb90ff3 |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
983 2: draft |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
984 |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
985 put the changeset in the draft state again |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
986 (first test after this one expect to be able to copy) |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
987 |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
988 $ cd .. |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
989 |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
990 |
15740
62aa9305399d
phases: copy phases data on local clone
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15713
diff
changeset
|
991 Test Clone behavior |
15713
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
992 |
15740
62aa9305399d
phases: copy phases data on local clone
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15713
diff
changeset
|
993 A. Clone without secret changeset |
15713
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
994 |
15740
62aa9305399d
phases: copy phases data on local clone
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15713
diff
changeset
|
995 1. cloning non-publishing repository |
15889
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
996 (Phase should be preserved) |
15740
62aa9305399d
phases: copy phases data on local clone
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15713
diff
changeset
|
997 |
15889
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
998 # make sure there is no secret so we can use a copy clone |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
999 |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1000 $ hg -R mu phase --draft 'secret()' |
15740
62aa9305399d
phases: copy phases data on local clone
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15713
diff
changeset
|
1001 |
62aa9305399d
phases: copy phases data on local clone
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15713
diff
changeset
|
1002 $ hg clone -U mu Tau |
62aa9305399d
phases: copy phases data on local clone
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15713
diff
changeset
|
1003 $ hgph -R Tau |
15889
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1004 o 12 draft mu-more - 5237fb433fc8 |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1005 | |
15889
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1006 | o 11 draft alpha-more - 1c5cfd894796 |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1007 | | |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1008 o | 10 draft A-secret - 435b5d83910c |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1009 |/ |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1010 o 9 public a-H - 967b449fbc94 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1011 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1012 | o 8 public a-F - b740e3e5c05d |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1013 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1014 | o 7 public a-E - e9f537e46dea |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1015 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1016 +---o 6 public n-B - 145e75495359 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1017 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1018 o | 5 public n-A - d6bcb4f74035 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1019 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1020 | o 4 public a-D - b555f63b6063 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1021 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1022 | o 3 public a-C - 54acac6f23ab |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1023 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1024 o | 2 public b-A - f54f1bb90ff3 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1025 |/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1026 o 1 public a-B - 548a3d25dbf0 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1027 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1028 o 0 public a-A - 054250a37db4 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1029 |
15740
62aa9305399d
phases: copy phases data on local clone
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15713
diff
changeset
|
1030 |
15741
60344b83e442
phases: on copy clone, do not copy phases data if repote is publishing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15740
diff
changeset
|
1031 2. cloning publishing repository |
60344b83e442
phases: on copy clone, do not copy phases data if repote is publishing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15740
diff
changeset
|
1032 |
60344b83e442
phases: on copy clone, do not copy phases data if repote is publishing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15740
diff
changeset
|
1033 (everything should be public) |
60344b83e442
phases: on copy clone, do not copy phases data if repote is publishing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15740
diff
changeset
|
1034 |
60344b83e442
phases: on copy clone, do not copy phases data if repote is publishing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15740
diff
changeset
|
1035 $ hg clone -U alpha Upsilon |
60344b83e442
phases: on copy clone, do not copy phases data if repote is publishing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15740
diff
changeset
|
1036 $ hgph -R Upsilon |
15889
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1037 o 13 public mu-more - 5237fb433fc8 |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1038 | |
15889
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1039 | o 12 public alpha-more - 1c5cfd894796 |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1040 | | |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1041 o | 11 public A-secret - 435b5d83910c |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1042 |/ |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1043 o 10 public a-H - 967b449fbc94 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1044 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1045 | o 9 public a-G - 3e27b6f1eee1 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1046 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1047 | o 8 public a-F - b740e3e5c05d |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1048 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1049 | o 7 public a-E - e9f537e46dea |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1050 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1051 +---o 6 public n-B - 145e75495359 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1052 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1053 o | 5 public n-A - d6bcb4f74035 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1054 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1055 o | 4 public b-A - f54f1bb90ff3 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1056 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1057 | o 3 public a-D - b555f63b6063 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1058 | | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1059 | o 2 public a-C - 54acac6f23ab |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1060 |/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1061 o 1 public a-B - 548a3d25dbf0 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1062 | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1063 o 0 public a-A - 054250a37db4 |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1064 |
17565
f62ed3d90377
tests: enable even more Windows server tests
Patrick Mezard <patrick@mezard.eu>
parents:
17424
diff
changeset
|
1065 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS |
15889
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1066 |