mercurial: tests/test-phases-exchange.t@ac9b85079122 (annotated)

22046 7a9cbb315d84 tests: replace exit 80 with #require Matt Mackall <mpm@selenic.com> parents: 21024 diff changeset	1	#require killdaemons
16539 249542ded278 tests: skip new tests with requirements not available on windows Mads Kiilerich <mads@kiilerich.com> parents: 16535 diff changeset	2
16013 2a1d97630f7f tests: don't use alias Mads Kiilerich <mads@kiilerich.com> parents: 15956 diff changeset	3	$ 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	4
a44446ff9ad8 phases: marked content of a changegroup as published Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	5	$ mkcommit() {
a44446ff9ad8 phases: marked content of a changegroup as published Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	6	> echo "$1" > "$1"
a44446ff9ad8 phases: marked content of a changegroup as published Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	7	> hg add "$1"
15713 cff25e4b37d2 phases: do not exchange secret changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15659 diff changeset	8	> message="$1"
cff25e4b37d2 phases: do not exchange secret changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15659 diff changeset	9	> shift
cff25e4b37d2 phases: do not exchange secret changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15659 diff changeset	10	> 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	11	> }
a44446ff9ad8 phases: marked content of a changegroup as published Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	12
a44446ff9ad8 phases: marked content of a changegroup as published Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	13	$ hg init alpha
a44446ff9ad8 phases: marked content of a changegroup as published Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	14	$ cd alpha
a44446ff9ad8 phases: marked content of a changegroup as published Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	15	$ mkcommit a-A
a44446ff9ad8 phases: marked content of a changegroup as published Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	16	$ mkcommit a-B
a44446ff9ad8 phases: marked content of a changegroup as published Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	17	$ mkcommit a-C
a44446ff9ad8 phases: marked content of a changegroup as published Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	18	$ mkcommit a-D
a44446ff9ad8 phases: marked content of a changegroup as published Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	19	$ 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	20	@ 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	21	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	22	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	23	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	24	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	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 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	27
15484 a44446ff9ad8 phases: marked content of a changegroup as published Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	28
a44446ff9ad8 phases: marked content of a changegroup as published Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	29	$ hg init ../beta
a44446ff9ad8 phases: marked content of a changegroup as published Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	30	$ 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	31	pushing to ../beta
a44446ff9ad8 phases: marked content of a changegroup as published Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	32	searching for changes
a44446ff9ad8 phases: marked content of a changegroup as published Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	33	adding changesets
a44446ff9ad8 phases: marked content of a changegroup as published Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	34	adding manifests
a44446ff9ad8 phases: marked content of a changegroup as published Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	35	adding file changes
a44446ff9ad8 phases: marked content of a changegroup as published Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	36	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	37	$ 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	38	@ 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	39	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	40	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	41	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	42	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	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 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	45
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	46
15484 a44446ff9ad8 phases: marked content of a changegroup as published Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	47	$ cd ../beta
a44446ff9ad8 phases: marked content of a changegroup as published Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	48	$ 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	49	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	50	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	51	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	52
15484 a44446ff9ad8 phases: marked content of a changegroup as published Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	53	$ hg up -q
a44446ff9ad8 phases: marked content of a changegroup as published Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	54	$ mkcommit b-A
a44446ff9ad8 phases: marked content of a changegroup as published Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	55	$ 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	56	@ 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	57	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	58	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	59	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	60	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	61
15484 a44446ff9ad8 phases: marked content of a changegroup as published Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	62	$ hg pull ../alpha
a44446ff9ad8 phases: marked content of a changegroup as published Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	63	pulling from ../alpha
a44446ff9ad8 phases: marked content of a changegroup as published Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	64	searching for changes
a44446ff9ad8 phases: marked content of a changegroup as published Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	65	adding changesets
a44446ff9ad8 phases: marked content of a changegroup as published Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	66	adding manifests
a44446ff9ad8 phases: marked content of a changegroup as published Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	67	adding file changes
a44446ff9ad8 phases: marked content of a changegroup as published Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	68	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	69	(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	70	$ 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	71	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	72	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	73	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	74	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	75	\| @ 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	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 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	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	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	80
15484 a44446ff9ad8 phases: marked content of a changegroup as published Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	81
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	82	pull did not updated ../alpha state.
17424 e7cfe3587ea4 fix trivial spelling errors Mads Kiilerich <mads@kiilerich.com> parents: 16539 diff changeset	83	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	84
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	85	$ 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	86	$ 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	87	@ 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	88	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	89	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	90	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	91	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	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 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	94
20314 b396032e1bb8 phase: properly compute ancestors of --rev on push (issue3786) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20117 diff changeset	95	$ hg push -r 2 ../beta
b396032e1bb8 phase: properly compute ancestors of --rev on push (issue3786) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20117 diff changeset	96	pushing to ../beta
b396032e1bb8 phase: properly compute ancestors of --rev on push (issue3786) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20117 diff changeset	97	searching for changes
b396032e1bb8 phase: properly compute ancestors of --rev on push (issue3786) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20117 diff changeset	98	no changes found
b396032e1bb8 phase: properly compute ancestors of --rev on push (issue3786) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20117 diff changeset	99	[1]
b396032e1bb8 phase: properly compute ancestors of --rev on push (issue3786) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20117 diff changeset	100	$ hgph
b396032e1bb8 phase: properly compute ancestors of --rev on push (issue3786) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20117 diff changeset	101	@ 3 draft a-D - b555f63b6063
b396032e1bb8 phase: properly compute ancestors of --rev on push (issue3786) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20117 diff changeset	102	\|
b396032e1bb8 phase: properly compute ancestors of --rev on push (issue3786) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20117 diff changeset	103	o 2 public a-C - 54acac6f23ab
b396032e1bb8 phase: properly compute ancestors of --rev on push (issue3786) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20117 diff changeset	104	\|
b396032e1bb8 phase: properly compute ancestors of --rev on push (issue3786) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20117 diff changeset	105	o 1 public a-B - 548a3d25dbf0
b396032e1bb8 phase: properly compute ancestors of --rev on push (issue3786) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20117 diff changeset	106	\|
b396032e1bb8 phase: properly compute ancestors of --rev on push (issue3786) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20117 diff changeset	107	o 0 public a-A - 054250a37db4
b396032e1bb8 phase: properly compute ancestors of --rev on push (issue3786) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20117 diff changeset	108
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	109	$ 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	110	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	111	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	112	no changes found
16023 90f8b8dd0326 push: return 1 if no changes found (issue3228) Matt Mackall <mpm@selenic.com> parents: 16013 diff changeset	113	[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	114	$ 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	115	@ 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	116	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	117	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	118	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	119	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	120	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	121	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	122
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	123
15486 1eefa4451c56 phases: set common changeset to public on pull Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15485 diff changeset	124	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	125
1eefa4451c56 phases: set common changeset to public on pull Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15485 diff changeset	126	$ 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	127	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	128	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	129	adding changesets
1eefa4451c56 phases: set common changeset to public on pull Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15485 diff changeset	130	adding manifests
1eefa4451c56 phases: set common changeset to public on pull Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15485 diff changeset	131	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	132	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	133	(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	134
1eefa4451c56 phases: set common changeset to public on pull Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15485 diff changeset	135	$ cd ../beta
1eefa4451c56 phases: set common changeset to public on pull Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15485 diff changeset	136	$ 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	137	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	138	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	139	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	140	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	141	\| @ 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	142	\|/
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	143	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	144	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	145	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	146
15486 1eefa4451c56 phases: set common changeset to public on pull Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15485 diff changeset	147	$ 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	148	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	149	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	150	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	151	$ 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	152	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	153	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	154	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	155	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	156	\| @ 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	157	\|/
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	158	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	159	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	160	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	161
15486 1eefa4451c56 phases: set common changeset to public on pull Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15485 diff changeset	162
15646 218ec96c45d7 phases: add a phases.publish option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15486 diff changeset	163	Publish configuration option
218ec96c45d7 phases: add a phases.publish option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15486 diff changeset	164	----------------------------
15486 1eefa4451c56 phases: set common changeset to public on pull Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15485 diff changeset	165
15650 5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	166	Pull
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	167	````
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	168
15646 218ec96c45d7 phases: add a phases.publish option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15486 diff changeset	169	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	170
218ec96c45d7 phases: add a phases.publish option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15486 diff changeset	171	$ hg bundle -a ../base.bundle
218ec96c45d7 phases: add a phases.publish option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15486 diff changeset	172	5 changesets found
218ec96c45d7 phases: add a phases.publish option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15486 diff changeset	173	$ cd ..
218ec96c45d7 phases: add a phases.publish option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15486 diff changeset	174	$ hg init mu
218ec96c45d7 phases: add a phases.publish option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15486 diff changeset	175	$ cd mu
218ec96c45d7 phases: add a phases.publish option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15486 diff changeset	176	$ cat > .hg/hgrc << EOF
218ec96c45d7 phases: add a phases.publish option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15486 diff changeset	177	> [phases]
218ec96c45d7 phases: add a phases.publish option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15486 diff changeset	178	> publish=0
218ec96c45d7 phases: add a phases.publish option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15486 diff changeset	179	> EOF
218ec96c45d7 phases: add a phases.publish option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15486 diff changeset	180	$ hg unbundle ../base.bundle
218ec96c45d7 phases: add a phases.publish option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15486 diff changeset	181	adding changesets
218ec96c45d7 phases: add a phases.publish option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15486 diff changeset	182	adding manifests
218ec96c45d7 phases: add a phases.publish option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15486 diff changeset	183	adding file changes
218ec96c45d7 phases: add a phases.publish option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15486 diff changeset	184	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	185	(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	186	$ 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	187	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	188	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	189	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	190	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	191	\| 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	192	\|/
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	193	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	194	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	195	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	196
15647 ce193147f492 phases: update exchange test to include node hash. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15646 diff changeset	197	$ cd ..
15646 218ec96c45d7 phases: add a phases.publish option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15486 diff changeset	198
15650 5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	199	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	200
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	201	$ hg init nu
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	202	$ cd nu
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	203	$ cat > .hg/hgrc << EOF
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	204	> [phases]
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	205	> publish=0
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	206	> EOF
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	207	$ hg pull ../mu -r 54acac6f23ab
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	208	pulling from ../mu
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	209	adding changesets
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	210	adding manifests
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	211	adding file changes
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	212	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	213	(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	214	$ 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	215	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	216	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	217	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	218	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	219	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	220
15650 5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	221
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	222	Even for common
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	223
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	224	$ hg pull ../mu -r f54f1bb90ff3
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	225	pulling from ../mu
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	226	searching for changes
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	227	adding changesets
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	228	adding manifests
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	229	adding file changes
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	230	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	231	(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	232	$ 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	233	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	234	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	235	\| 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	236	\|/
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	237	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	238	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	239	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	240
15650 5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	241
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	242
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	243	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	244	we are in nu
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	245
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	246	$ hg pull ../alpha -r b555f63b6063
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	247	pulling from ../alpha
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	248	searching for changes
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	249	adding changesets
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	250	adding manifests
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	251	adding file changes
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	252	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	253	(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	254	$ 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	255	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	256	\|
15956 5653f2d166ea push: prevent moving phases outside of the pushed subset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15891 diff changeset	257	\| 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	258	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	259	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	260	\|/
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	261	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	262	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	263	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	264
15650 5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	265
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	266	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	267
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	268	$ hg up -q f54f1bb90ff3
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	269	$ mkcommit n-A
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	270	$ mkcommit n-B
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	271	$ 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	272	@ 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	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 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	275	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	276	\| 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	277	\| \|
15956 5653f2d166ea push: prevent moving phases outside of the pushed subset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15891 diff changeset	278	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	279	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	280	\| 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	281	\|/
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	282	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	283	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	284	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	285
15650 5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	286	$ cd ../mu
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	287	$ hg pull ../nu
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	288	pulling from ../nu
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	289	searching for changes
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	290	adding changesets
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	291	adding manifests
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	292	adding file changes
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	293	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	294	(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	295	$ 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	296	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	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 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	299	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	300	\| 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	301	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	302	\| 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	303	\| \|
15956 5653f2d166ea push: prevent moving phases outside of the pushed subset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15891 diff changeset	304	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	305	\|/
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 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	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	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	309
15650 5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	310	$ cd ..
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	311
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	312	pulling into publish=True
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	313
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	314	$ cd alpha
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	315	$ 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	316	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	317	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	318	\| @ 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	319	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	320	\| 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	321	\|/
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	322	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	323	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	324	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	325
15650 5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	326	$ hg pull ../mu
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	327	pulling from ../mu
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	328	searching for changes
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	329	adding changesets
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	330	adding manifests
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	331	adding file changes
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	332	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	333	(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	334	$ 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	335	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	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 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	338	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	339	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	340	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	341	\| @ 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	342	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	343	\| 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	344	\|/
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	345	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	346	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	347	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	348
15650 5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	349	$ cd ..
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	350
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	351	pulling back into original repo
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	352
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	353	$ cd nu
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	354	$ hg pull ../alpha
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	355	pulling from ../alpha
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	356	searching for changes
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	357	no changes found
5b26667fc4d3 phases: exchange phase boundaries on pull Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15647 diff changeset	358	$ 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	359	@ 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	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 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	362	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	363	\| 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	364	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	365	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	366	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	367	\| 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	368	\|/
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	369	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	370	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	371	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	372
15651 e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	373
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	374	Push
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	375	````
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	376
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	377	(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	378
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	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	380	(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	381
7fba5a245acc phases: change publish behavior to only alter behavior when server. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15651 diff changeset	382	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	383
7fba5a245acc phases: change publish behavior to only alter behavior when server. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15651 diff changeset	384	$ 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	385	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	386	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	387	no changes found
16023 90f8b8dd0326 push: return 1 if no changes found (issue3228) Matt Mackall <mpm@selenic.com> parents: 16013 diff changeset	388	[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	389	$ 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	390	$ 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	391	$ 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	392	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	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 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	395	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	396	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	397	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	398	\| @ 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	399	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	400	\| 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	401	\|/
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	402	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	403	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	404	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	405
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	406
7fba5a245acc phases: change publish behavior to only alter behavior when server. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15651 diff changeset	407	(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	408
7fba5a245acc phases: change publish behavior to only alter behavior when server. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15651 diff changeset	409
15651 e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	410	initial setup
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	411
20117 aa9385f983fa tests: don't load unnecessary graphlog extension Martin Geisler <martin@geisler.net> parents: 20008 diff changeset	412	$ hg log -G # of alpha
15651 e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	413	o changeset: 6:145e75495359
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	414	\| tag: tip
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	415	\| user: test
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	416	\| 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	417	\| summary: n-B
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	418	\|
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	419	o changeset: 5:d6bcb4f74035
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	420	\| user: test
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	421	\| 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	422	\| summary: n-A
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	423	\|
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	424	o changeset: 4:f54f1bb90ff3
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	425	\| parent: 1:548a3d25dbf0
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: b-A
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	\| @ changeset: 3:b555f63b6063
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-D
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: 2:54acac6f23ab
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-C
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	o changeset: 1:548a3d25dbf0
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	441	\| user: test
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	442	\| 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	443	\| summary: a-B
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	444	\|
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	445	o changeset: 0:054250a37db4
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	446	user: test
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	447	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	448	summary: a-A
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	449
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	450	$ mkcommit a-E
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	451	$ mkcommit a-F
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	452	$ mkcommit a-G
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	453	$ hg up d6bcb4f74035 -q
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	454	$ mkcommit a-H
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	455	created new head
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	456	$ 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	457	@ 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	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 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	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 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	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 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	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 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	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 \| 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	468	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	469	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	470	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	471	\| 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	472	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	473	\| 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	474	\|/
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	475	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	476	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	477	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	478
15651 e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	479
16195 40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 16107 diff changeset	480	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	481
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 16107 diff changeset	482	$ 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	483	5 changesets found
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 16107 diff changeset	484	$ 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	485	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	486	searching for changes
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 16107 diff changeset	487	no changes found
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 16107 diff changeset	488	$ hgph
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 16107 diff changeset	489	@ 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	490	\|
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 16107 diff changeset	491	\| 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	492	\| \|
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 16107 diff changeset	493	\| 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	494	\| \|
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 16107 diff changeset	495	\| 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	496	\| \|
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 16107 diff changeset	497	+---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	498	\| \|
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 16107 diff changeset	499	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	500	\| \|
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 16107 diff changeset	501	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	502	\| \|
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 16107 diff changeset	503	\| 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	504	\| \|
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 16107 diff changeset	505	\| 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	506	\|/
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 16107 diff changeset	507	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	508	\|
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 16107 diff changeset	509	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	510
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 16107 diff changeset	511
15651 e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	512	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	513
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	514	$ 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	515	pushing to ../mu
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	516	searching for changes
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	517	adding changesets
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	518	adding manifests
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	519	adding file changes
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	520	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	521	$ 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	522	@ 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	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 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	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 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	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 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	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 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	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 \| 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	533	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	534	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	535	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	536	\| 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	537	\| \|
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 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	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 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	541	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	542	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	543
15651 e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	544
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	545	$ 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	546	$ 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	547	> # 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	548	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	549	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	550	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	551	\|
15956 5653f2d166ea push: prevent moving phases outside of the pushed subset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15891 diff changeset	552	\| 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	553	\| \|
15956 5653f2d166ea push: prevent moving phases outside of the pushed subset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15891 diff changeset	554	\| 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	555	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	556	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	557	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	558	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	559	\| \|
15956 5653f2d166ea push: prevent moving phases outside of the pushed subset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15891 diff changeset	560	\| 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	561	\|/
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	562	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	563	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	564	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	565
15651 e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	566
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	567	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	568
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	569	$ hg push ../beta -r b740e3e5c05d
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	570	pushing to ../beta
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	571	searching for changes
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	572	adding changesets
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	573	adding manifests
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	574	adding file changes
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	575	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	576	$ 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	577	> # 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	578	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	579	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	580	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	581	\|
15956 5653f2d166ea push: prevent moving phases outside of the pushed subset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15891 diff changeset	582	\| 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	583	\| \|
15956 5653f2d166ea push: prevent moving phases outside of the pushed subset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15891 diff changeset	584	\| 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	585	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	586	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	587	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	588	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	589	\| \|
15956 5653f2d166ea push: prevent moving phases outside of the pushed subset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15891 diff changeset	590	\| 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	591	\|/
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	592	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	593	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	594	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	595
15651 e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	596
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	597	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	598
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	599	$ cd ../beta
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	600	$ hg push ../alpha
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	601	pushing to ../alpha
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	602	searching for changes
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	603	no changes found
16023 90f8b8dd0326 push: return 1 if no changes found (issue3228) Matt Mackall <mpm@selenic.com> parents: 16013 diff changeset	604	[1]
15651 e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	605	$ 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	606	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	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 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	609	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	610	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	611	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	612	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	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	\| @ 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	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 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	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 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	619
15651 e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	620	$ 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	621	$ 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	622	@ 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	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 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	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 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	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 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	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 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	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 \| 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	633	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	634	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	635	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	636	\| 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	637	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	638	\| 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	639	\|/
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	640	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	641	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	642	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	643
15651 e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	644
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	645	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	646
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	647	$ 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	648	pushing to ../mu
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	649	searching for changes
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	650	adding changesets
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	651	adding manifests
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	652	adding file changes
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	653	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	654	$ 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	655	@ 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	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 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	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 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	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 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	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 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	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 \| 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	666	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	667	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	668	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	669	\| 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	670	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	671	\| 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	672	\|/
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	673	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	674	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	675	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	676
15651 e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	677	$ cd ../mu
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	678	$ 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	679	> # 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	680	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	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 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	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 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	685	\| \|
15956 5653f2d166ea push: prevent moving phases outside of the pushed subset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15891 diff changeset	686	+---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	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 \| 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	689	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	690	\| 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	691	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	692	\| 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	693	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	694	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	695	\|/
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	696	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	697	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	698	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	699
15651 e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	700
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	701
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	702	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	703
15713 cff25e4b37d2 phases: do not exchange secret changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15659 diff changeset	704	(in mu)
15651 e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	705	$ hg push ../alpha
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	706	pushing to ../alpha
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	707	searching for changes
e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	708	no changes found
16023 90f8b8dd0326 push: return 1 if no changes found (issue3228) Matt Mackall <mpm@selenic.com> parents: 16013 diff changeset	709	[1]
15651 e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	710	$ 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	711	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	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 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	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 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	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 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	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 \| 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	720	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	721	\| 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	722	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	723	\| 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	724	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	725	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	726	\|/
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	727	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	728	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	729	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	730
15651 e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	731	$ 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	732	@ 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	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 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	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 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	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 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	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 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	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 \| 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	743	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	744	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	745	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	746	\| 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	747	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	748	\| 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	749	\|/
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	750	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	751	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	752	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	753
15651 e69a3cdad37e phases: exchange phase boundaries on push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15650 diff changeset	754
15713 cff25e4b37d2 phases: do not exchange secret changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15659 diff changeset	755
21010 3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	756	Bare push with next changeset and common changeset needing sync (issue3575)
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	757
23139 e53f6b72a0e4 spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 22046 diff changeset	758	(reset some stat on remote repo to avoid confusing other tests)
21010 3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	759
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	760	$ hg -R ../alpha --config extensions.strip= strip --no-backup 967b449fbc94
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	761	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	762	$ hg phase --force --draft b740e3e5c05d 967b449fbc94
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	763	$ hg push -fv ../alpha
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	764	pushing to ../alpha
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	765	searching for changes
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	766	1 changesets found
23748 4ab66de46a96 bundle: when verbose, show what takes up the space in the generated bundle Mads Kiilerich <madski@unity3d.com> parents: 23139 diff changeset	767	uncompressed size of bundle content:
27752 29cfc474c5fd changegroup3: introduce experimental.changegroup3 boolean config Martin von Zweigbergk <martinvonz@google.com> parents: 27433 diff changeset	768	192 (changelog)
29cfc474c5fd changegroup3: introduce experimental.changegroup3 boolean config Martin von Zweigbergk <martinvonz@google.com> parents: 27433 diff changeset	769	165 (manifests)
29cfc474c5fd changegroup3: introduce experimental.changegroup3 boolean config Martin von Zweigbergk <martinvonz@google.com> parents: 27433 diff changeset	770	131 a-H
21010 3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	771	adding changesets
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	772	adding manifests
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	773	adding file changes
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	774	added 1 changesets with 1 changes to 1 files (+1 heads)
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	775	$ hgph
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	776	o 9 public a-H - 967b449fbc94
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	777	\|
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	778	\| o 8 public a-F - b740e3e5c05d
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	779	\| \|
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	780	\| o 7 public a-E - e9f537e46dea
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	781	\| \|
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	782	+---o 6 public n-B - 145e75495359
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	783	\| \|
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	784	o \| 5 public n-A - d6bcb4f74035
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	785	\| \|
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	786	\| o 4 public a-D - b555f63b6063
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	787	\| \|
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	788	\| o 3 public a-C - 54acac6f23ab
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	789	\| \|
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	790	o \| 2 public b-A - f54f1bb90ff3
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	791	\|/
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	792	o 1 public a-B - 548a3d25dbf0
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	793	\|
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	794	o 0 public a-A - 054250a37db4
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	795
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	796
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	797	$ hg -R ../alpha update 967b449fbc94 #for latter test consistency
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	798	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	799	$ hgph -R ../alpha
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	800	@ 10 public a-H - 967b449fbc94
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	801	\|
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	802	\| o 9 draft a-G - 3e27b6f1eee1
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	803	\| \|
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	804	\| o 8 public a-F - b740e3e5c05d
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	805	\| \|
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	806	\| o 7 public a-E - e9f537e46dea
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	807	\| \|
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	808	+---o 6 public n-B - 145e75495359
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	809	\| \|
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	810	o \| 5 public n-A - d6bcb4f74035
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	811	\| \|
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	812	o \| 4 public b-A - f54f1bb90ff3
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	813	\| \|
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	814	\| o 3 public a-D - b555f63b6063
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	815	\| \|
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	816	\| o 2 public a-C - 54acac6f23ab
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	817	\|/
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	818	o 1 public a-B - 548a3d25dbf0
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	819	\|
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	820	o 0 public a-A - 054250a37db4
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	821
3d4b54a6f346 phase: add a passing test for (issue3575) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20314 diff changeset	822
15713 cff25e4b37d2 phases: do not exchange secret changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15659 diff changeset	823	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	824
cff25e4b37d2 phases: do not exchange secret changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15659 diff changeset	825	- 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	826
cff25e4b37d2 phases: do not exchange secret changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15659 diff changeset	827	$ cd ../alpha
cff25e4b37d2 phases: do not exchange secret changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15659 diff changeset	828	$ 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	829	$ 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	830	@ 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	831	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	832	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	833	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	834	\| 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	835	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	836	\| 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	837	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	838	\| 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	839	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	840	+---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	841	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	842	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	843	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	844	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	845	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	846	\| 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	847	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	848	\| 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	849	\|/
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	850	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	851	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	852	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	853
15713 cff25e4b37d2 phases: do not exchange secret changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15659 diff changeset	854	$ 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	855	1 changesets found
cff25e4b37d2 phases: do not exchange secret changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15659 diff changeset	856	$ 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	857	adding changesets
cff25e4b37d2 phases: do not exchange secret changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15659 diff changeset	858	adding manifests
cff25e4b37d2 phases: do not exchange secret changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15659 diff changeset	859	adding file changes
cff25e4b37d2 phases: do not exchange secret changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15659 diff changeset	860	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	861	(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	862	$ 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	863	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	864	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	865	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	866	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	867	\| 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	868	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	869	\| 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	870	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	871	+---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	872	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	873	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	874	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	875	\| 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	876	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	877	\| 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	878	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	879	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	880	\|/
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	881	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	882	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	883	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	884
15713 cff25e4b37d2 phases: do not exchange secret changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15659 diff changeset	885	$ hg pull ../mu
cff25e4b37d2 phases: do not exchange secret changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15659 diff changeset	886	pulling from ../mu
cff25e4b37d2 phases: do not exchange secret changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15659 diff changeset	887	searching for changes
cff25e4b37d2 phases: do not exchange secret changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15659 diff changeset	888	no changes found
cff25e4b37d2 phases: do not exchange secret changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15659 diff changeset	889	$ 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	890	@ 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	891	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	892	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	893	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	894	\| 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	895	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	896	\| 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	897	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	898	\| 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	899	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	900	+---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	901	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	902	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	903	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	904	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	905	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	906	\| 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	907	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	908	\| 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	909	\|/
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	910	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	911	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	912	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	913
15889 816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	914
21024 7731a2281cf0 spelling: fixes from spell checker Mads Kiilerich <madski@unity3d.com> parents: 21010 diff changeset	915	pushing a locally public and draft changesets remotely secret should make them
16535 39d1f83eb05d branchmap: server should not advertise secret changeset in branchmap (Issue3303) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 16195 diff changeset	916	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	917
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	918	$ 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	919	$ 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	920	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	921	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	922	abort: push creates new remote head 435b5d83910c!
19934 bfc6ed892349 push: hide description about "-f" in the hint to prevent from using it easily FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19116 diff changeset	923	(merge or see "hg help push" for details about pushing new heads)
16535 39d1f83eb05d branchmap: server should not advertise secret changeset in branchmap (Issue3303) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 16195 diff changeset	924	[255]
39d1f83eb05d branchmap: server should not advertise secret changeset in branchmap (Issue3303) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 16195 diff changeset	925	$ 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	926	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	927	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	928	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	929	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	930	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	931	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	932	$ 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	933	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	934	\|
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	935	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	936	\|
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	937	\| 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	938	\| \|
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	939	\| 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	940	\| \|
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	941	+---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	942	\| \|
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	943	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	944	\| \|
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	945	\| 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	946	\| \|
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	947	\| 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	948	\| \|
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	949	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	950	\|/
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	951	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	952	\|
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	953	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	954
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	955
15889 816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	956	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	957
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	958	$ 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	959	$ 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	960	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	961	$ 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	962	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	963	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	964	adding changesets
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	965	adding manifests
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	966	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	967	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	968	$ cd ../mu
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	969	$ 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	970	$ 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	971	$ 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	972	$ cd ../alpha
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	973	$ 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	974	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	975	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	976	adding changesets
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	977	adding manifests
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	978	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	979	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	980	(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	981	$ hgph
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	982	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	983	\|
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	984	\| @ 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	985	\| \|
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	986	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	987	\|/
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	988	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	989	\|
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	990	\| 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	991	\| \|
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	992	\| 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	993	\| \|
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	994	\| 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	995	\| \|
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	996	+---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	997	\| \|
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	998	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	999	\| \|
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	1000	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	1001	\| \|
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	1002	\| 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	1003	\| \|
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	1004	\| 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	1005	\|/
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	1006	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	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 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	1009
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	1010
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	1011	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	1012
15740 62aa9305399d phases: copy phases data on local clone Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	1013	$ cd ..
15889 816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	1014	$ 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	1015
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	1016	# 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	1017	#
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	1018	# * secret remotely
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	1019	# * known locally
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	1020	# * 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	1021
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	1022	$ 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	1023	$ 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	1024
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	1025	$ cd gamma
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	1026	$ 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	1027	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	1028	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	1029	adding changesets
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	1030	adding manifests
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	1031	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	1032	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	1033	(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	1034	$ 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	1035	2: draft
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	1036
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	1037	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	1038
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	1039	$ cd ../beta
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	1040	$ 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	1041	$ 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	1042	$ cd ../gamma
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	1043
25356 d49328038b38 test: explicitly test wire protocol discovery with bundle1 and bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 25355 diff changeset	1044	$ hg pull http://localhost:$HGPORT/ --config experimental.bundle2-exp=True
d49328038b38 test: explicitly test wire protocol discovery with bundle1 and bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 25355 diff changeset	1045	pulling from http://localhost:$HGPORT/
d49328038b38 test: explicitly test wire protocol discovery with bundle1 and bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 25355 diff changeset	1046	searching for changes
d49328038b38 test: explicitly test wire protocol discovery with bundle1 and bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 25355 diff changeset	1047	no changes found
d49328038b38 test: explicitly test wire protocol discovery with bundle1 and bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 25355 diff changeset	1048	$ hg phase f54f1bb90ff3
d49328038b38 test: explicitly test wire protocol discovery with bundle1 and bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 25355 diff changeset	1049	2: draft
d49328038b38 test: explicitly test wire protocol discovery with bundle1 and bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 25355 diff changeset	1050
d49328038b38 test: explicitly test wire protocol discovery with bundle1 and bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 25355 diff changeset	1051	enforce bundle1
d49328038b38 test: explicitly test wire protocol discovery with bundle1 and bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 25355 diff changeset	1052
29687 ac9b85079122 tests: use 'legacy.exchange' option in various mixed tests Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29658 diff changeset	1053	$ hg pull http://localhost:$HGPORT/ --config devel.legacy.exchange=bundle1
15889 816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	1054	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	1055	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	1056	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	1057	$ 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	1058	2: draft
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	1059
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	1060	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	1061
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	1062	$ 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	1063	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	1064	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	1065	no changes found
16023 90f8b8dd0326 push: return 1 if no changes found (issue3228) Matt Mackall <mpm@selenic.com> parents: 16013 diff changeset	1066	[1]
15889 816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	1067	$ 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	1068	2: draft
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	1069
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	1070	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	1071	(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	1072
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	1073	$ cd ..
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	1074
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	1075
15740 62aa9305399d phases: copy phases data on local clone Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	1076	Test Clone behavior
15713 cff25e4b37d2 phases: do not exchange secret changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15659 diff changeset	1077
15740 62aa9305399d phases: copy phases data on local clone Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	1078	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	1079
15740 62aa9305399d phases: copy phases data on local clone Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	1080	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	1081	(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	1082
15889 816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	1083	# 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	1084
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	1085	$ 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	1086
62aa9305399d phases: copy phases data on local clone Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	1087	$ 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	1088	$ 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	1089	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	1090	\|
15889 816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	1091	\| 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	1092	\| \|
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	1093	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	1094	\|/
15824 94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	1095	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	1096	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	1097	\| 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	1098	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	1099	\| 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	1100	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	1101	+---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	1102	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	1103	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	1104	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	1105	\| 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	1106	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	1107	\| 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	1108	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	1109	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	1110	\|/
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	1111	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	1112	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	1113	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	1114
15740 62aa9305399d phases: copy phases data on local clone Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	1115
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	1116	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	1117
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	1118	(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	1119
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	1120	$ 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	1121	$ 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	1122	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	1123	\|
15889 816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	1124	\| 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	1125	\| \|
816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	1126	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	1127	\|/
15824 94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	1128	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	1129	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	1130	\| 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	1131	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	1132	\| 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	1133	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	1134	\| 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	1135	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	1136	+---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	1137	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	1138	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	1139	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	1140	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	1141	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	1142	\| 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	1143	\| \|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	1144	\| 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	1145	\|/
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	1146	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	1147	\|
94a4748db392 phases: use graph and phase name in exchange test Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15823 diff changeset	1148	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	1149
20008 e54a078153f7 tests: skip tests that require not having root (issue4089) Matt Mackall <mpm@selenic.com> parents: 19934 diff changeset	1150	#if unix-permissions no-root
19097 3f5e75c22585 push: make locking of source optional (issue3684) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17565 diff changeset	1151
3f5e75c22585 push: make locking of source optional (issue3684) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17565 diff changeset	1152	Pushing From an unlockable repo
3f5e75c22585 push: make locking of source optional (issue3684) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17565 diff changeset	1153	--------------------------------
3f5e75c22585 push: make locking of source optional (issue3684) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17565 diff changeset	1154	(issue3684)
3f5e75c22585 push: make locking of source optional (issue3684) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17565 diff changeset	1155
3f5e75c22585 push: make locking of source optional (issue3684) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17565 diff changeset	1156	Unability to lock the source repo should not prevent the push. It will prevent
3f5e75c22585 push: make locking of source optional (issue3684) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17565 diff changeset	1157	the retrieval of remote phase during push. For example, pushing to a publishing
3f5e75c22585 push: make locking of source optional (issue3684) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17565 diff changeset	1158	server won't turn changeset public.
3f5e75c22585 push: make locking of source optional (issue3684) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17565 diff changeset	1159
3f5e75c22585 push: make locking of source optional (issue3684) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17565 diff changeset	1160	1. Test that push is not prevented
3f5e75c22585 push: make locking of source optional (issue3684) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17565 diff changeset	1161
3f5e75c22585 push: make locking of source optional (issue3684) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17565 diff changeset	1162	$ hg init Phi
3f5e75c22585 push: make locking of source optional (issue3684) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17565 diff changeset	1163	$ cd Upsilon
3f5e75c22585 push: make locking of source optional (issue3684) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17565 diff changeset	1164	$ chmod -R -w .hg
3f5e75c22585 push: make locking of source optional (issue3684) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17565 diff changeset	1165	$ hg push ../Phi
3f5e75c22585 push: make locking of source optional (issue3684) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17565 diff changeset	1166	pushing to ../Phi
3f5e75c22585 push: make locking of source optional (issue3684) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17565 diff changeset	1167	searching for changes
3f5e75c22585 push: make locking of source optional (issue3684) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17565 diff changeset	1168	adding changesets
3f5e75c22585 push: make locking of source optional (issue3684) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17565 diff changeset	1169	adding manifests
3f5e75c22585 push: make locking of source optional (issue3684) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17565 diff changeset	1170	adding file changes
3f5e75c22585 push: make locking of source optional (issue3684) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17565 diff changeset	1171	added 14 changesets with 14 changes to 14 files (+3 heads)
3f5e75c22585 push: make locking of source optional (issue3684) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17565 diff changeset	1172	$ chmod -R +w .hg
3f5e75c22585 push: make locking of source optional (issue3684) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17565 diff changeset	1173
3f5e75c22585 push: make locking of source optional (issue3684) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17565 diff changeset	1174	2. Test that failed phases movement are reported
3f5e75c22585 push: make locking of source optional (issue3684) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17565 diff changeset	1175
3f5e75c22585 push: make locking of source optional (issue3684) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17565 diff changeset	1176	$ hg phase --force --draft 3
3f5e75c22585 push: make locking of source optional (issue3684) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17565 diff changeset	1177	$ chmod -R -w .hg
3f5e75c22585 push: make locking of source optional (issue3684) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17565 diff changeset	1178	$ hg push ../Phi
3f5e75c22585 push: make locking of source optional (issue3684) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17565 diff changeset	1179	pushing to ../Phi
3f5e75c22585 push: make locking of source optional (issue3684) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17565 diff changeset	1180	searching for changes
3f5e75c22585 push: make locking of source optional (issue3684) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17565 diff changeset	1181	no changes found
3f5e75c22585 push: make locking of source optional (issue3684) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17565 diff changeset	1182	cannot lock source repo, skipping local public phase update
3f5e75c22585 push: make locking of source optional (issue3684) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17565 diff changeset	1183	[1]
3f5e75c22585 push: make locking of source optional (issue3684) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17565 diff changeset	1184	$ chmod -R +w .hg
3f5e75c22585 push: make locking of source optional (issue3684) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17565 diff changeset	1185	$ hgph Upsilon
3f5e75c22585 push: make locking of source optional (issue3684) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17565 diff changeset	1186
3f5e75c22585 push: make locking of source optional (issue3684) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17565 diff changeset	1187	$ cd ..
3f5e75c22585 push: make locking of source optional (issue3684) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17565 diff changeset	1188
25474 8c14f87bd0ae tests: drop DAEMON_PIDS from killdaemons calls Matt Mackall <mpm@selenic.com> parents: 25472 diff changeset	1189	$ killdaemons.py
15889 816209eaf963 phases: make secret changeset undiscoverable in all case Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15824 diff changeset	1190
19116 dfb514836b78 tests: skip permissions tests in test-phases-exchange when fs lacks permissions Brendan Cully <brendan@kublai.com> parents: 19097 diff changeset	1191	#endif

author	Pierre-Yves David <pierre-yves.david@ens-lyon.org>
	Wed, 03 Aug 2016 15:39:55 +0200
changeset 29687	ac9b85079122
parent 29658	5a06291fa8fe
child 29688	30c59bdd4f41
permissions	-rw-r--r--