evolve: tests/test-evolve-phase-divergence.t@1f020455f6fe (annotated)

3610 145dab8c60c9 tests: rename test-evolve-bumped to test-evolve-phase-divergence.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3155 diff changeset	1	Test for handling of phase divergent changesets by `hg evolve`
145dab8c60c9 tests: rename test-evolve-bumped to test-evolve-phase-divergence.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3155 diff changeset	2	====================================================================
145dab8c60c9 tests: rename test-evolve-bumped to test-evolve-phase-divergence.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3155 diff changeset	3
3617 a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	4	$ cat >> $HGRCPATH <<EOF
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	5	> [alias]
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	6	> glog = log -GT "{rev}:{node\|short} {desc}\n ({bookmarks}) {phase}"
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	7	> EOF
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	8
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	9	Setting up a public repo
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	10	------------------------
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	11
1150 2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	12	$ hg init public
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	13	$ cd public
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	14	$ echo a > a
1417 9e7da169f66e test-evolve-bumped: add new test case for merge Laurent Charignon <lcharignon@fb.com> parents: 1416 diff changeset	15	$ mkcommit() {
9e7da169f66e test-evolve-bumped: add new test case for merge Laurent Charignon <lcharignon@fb.com> parents: 1416 diff changeset	16	> echo "$1" > "$1"
9e7da169f66e test-evolve-bumped: add new test case for merge Laurent Charignon <lcharignon@fb.com> parents: 1416 diff changeset	17	> hg add "$1"
9e7da169f66e test-evolve-bumped: add new test case for merge Laurent Charignon <lcharignon@fb.com> parents: 1416 diff changeset	18	> hg ci -m "add $1"
9e7da169f66e test-evolve-bumped: add new test case for merge Laurent Charignon <lcharignon@fb.com> parents: 1416 diff changeset	19	> }
1150 2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	20	$ hg commit -A -m init
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	21	adding a
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	22	$ cd ..
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	23
1806 9f42f819267b evolve: move the extensions to 'hgext3rd' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1453 diff changeset	24	$ evolvepath=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/
3617 a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	25
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	26	Setting up a private non-publishing repo
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	27	----------------------------------------
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	28
1150 2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	29	$ hg clone -U public private
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	30	$ cd private
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	31	$ cat >> .hg/hgrc <<EOF
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	32	> [extensions]
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	33	> evolve = $evolvepath
1416 b8a9d2e8c772 test-evolve-bumped: improve tests legibility Laurent Charignon <lcharignon@fb.com> parents: 1404 diff changeset	34	> [ui]
b8a9d2e8c772 test-evolve-bumped: improve tests legibility Laurent Charignon <lcharignon@fb.com> parents: 1404 diff changeset	35	> logtemplate = {rev}:{node\|short}@{branch}({phase}) {desc\|firstline}\n
1150 2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	36	> [phases]
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	37	> publish = false
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	38	> EOF
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	39	$ cd ..
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	40
3617 a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	41	Setting up couple of more instances of private repo
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	42	---------------------------------------------------
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	43
1150 2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	44	$ cp -a private alice
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	45	$ cp -a private bob
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	46
3617 a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	47	Creating a phase-divergence changeset
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	48	-------------------------------------
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	49
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	50	Alice creating a draft changeset and pushing to main private repo
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	51
1150 2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	52	$ cd alice
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	53	$ hg update
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	54	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	55	$ echo a >> a
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	56	$ hg commit -u alice -m 'modify a'
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	57	$ hg push ../private
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	58	pushing to ../private
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	59	searching for changes
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	60	adding changesets
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	61	adding manifests
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	62	adding file changes
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	63	added 1 changesets with 1 changes to 1 files
3617 a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	64	$ hg glog
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	65	@ 1:4d1169d82e47 modify a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	66	\| () draft
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	67	o 0:d3873e73d99e init
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	68	() public
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	69
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	70	Bob pulling from private repo and pushing to the main public repo making the
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	71	changeset public
1150 2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	72
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	73	$ cd ../bob
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	74	$ hg pull ../private
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	75	pulling from ../private
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	76	searching for changes
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	77	adding changesets
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	78	adding manifests
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	79	adding file changes
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	80	added 1 changesets with 1 changes to 1 files
3075 8feb2cae7eae test: adapt to output change from eb586ed5d8ce Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3013 diff changeset	81	new changesets 4d1169d82e47
1150 2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	82	(run 'hg update' to get a working copy)
3617 a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	83
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	84	$ hg glog
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	85	o 1:4d1169d82e47 modify a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	86	\| () draft
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	87	o 0:d3873e73d99e init
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	88	() public
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	89
1150 2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	90	$ hg push ../public
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	91	pushing to ../public
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	92	searching for changes
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	93	adding changesets
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	94	adding manifests
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	95	adding file changes
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	96	added 1 changesets with 1 changes to 1 files
3617 a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	97
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	98	$ hg glog
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	99	o 1:4d1169d82e47 modify a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	100	\| () public
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	101	o 0:d3873e73d99e init
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	102	() public
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	103
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	104	But Alice decided to amend the changeset she had and then pulling from public
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	105	repo creating phase-divergent changeset locally
1150 2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	106
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	107	$ cd ../alice
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	108	$ hg amend -m 'tweak a'
3618 2d8e39919742 tests: various comment on test-evolve-phase-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: 3617 diff changeset	109
2d8e39919742 tests: various comment on test-evolve-phase-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: 3617 diff changeset	110	XXX: pull should tell us how to see what is the new phase-divergent changeset
1150 2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	111	$ hg pull ../public
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	112	pulling from ../public
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	113	searching for changes
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	114	no changes found
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	115	1 new phase-divergent changesets
1150 2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	116
3617 a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	117	$ hg glog
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	118	@ 2:98bb3a6cfe1a tweak a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	119	\| () draft
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	120	\| o 1:4d1169d82e47 modify a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	121	\|/ () public
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	122	o 0:d3873e73d99e init
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	123	() public
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	124
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	125	Using evolve --list to list phase-divergent changesets
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	126	------------------------------------------------------
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	127
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	128	$ hg evolve --list
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	129	98bb3a6cfe1a: tweak a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	130	phase-divergent: 4d1169d82e47 (immutable precursor)
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	131
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	132
3618 2d8e39919742 tests: various comment on test-evolve-phase-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: 3617 diff changeset	133
2d8e39919742 tests: various comment on test-evolve-phase-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: 3617 diff changeset	134	XXX-Pulkit: Trying to see instability on public changeset
3617 a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	135
3618 2d8e39919742 tests: various comment on test-evolve-phase-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: 3617 diff changeset	136	XXX-Pulkit: this is not helpful
2d8e39919742 tests: various comment on test-evolve-phase-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: 3617 diff changeset	137
2d8e39919742 tests: various comment on test-evolve-phase-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: 3617 diff changeset	138	XXX-Marmoute: public changeset "instable themself"
2d8e39919742 tests: various comment on test-evolve-phase-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: 3617 diff changeset	139	XXX-Marmoute: I'm not sure if we store this information and it is useful to show it.
2d8e39919742 tests: various comment on test-evolve-phase-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: 3617 diff changeset	140	XXX-Marmoute: We should maybe point the user toward `hg obslog` instead`
3617 a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	141	$ hg evolve -r 4d1169d8 --list
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	142	4d1169d82e47: modify a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	143
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	144
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	145	Understanding phasedivergence using obslog
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	146	------------------------------------------
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	147
3618 2d8e39919742 tests: various comment on test-evolve-phase-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: 3617 diff changeset	148	XXX: There must be mention of phase-divergence here
3617 a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	149	$ hg obslog -r . --all
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	150	@ 98bb3a6cfe1a (2) tweak a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	151	\|
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	152	o 4d1169d82e47 (1) modify a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	153	rewritten(description) as 98bb3a6cfe1a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	154
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	155	Solving the phase divergence using evolve command
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	156	--------------------------------------------------
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	157
3618 2d8e39919742 tests: various comment on test-evolve-phase-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: 3617 diff changeset	158	(We do not solve evolution other than orphan by default because it turned out
2d8e39919742 tests: various comment on test-evolve-phase-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: 3617 diff changeset	159	it was too confusing for users. We used to behave this way, but having multiple
2d8e39919742 tests: various comment on test-evolve-phase-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: 3617 diff changeset	160	possible outcome to evolve end up scaring people)
2d8e39919742 tests: various comment on test-evolve-phase-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: 3617 diff changeset	161
3617 a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	162	$ hg evolve
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	163	nothing to evolve on current working copy parent
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	164	(do you want to use --phase-divergent)
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	165	[2]
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	166
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	167	testing the --confirm option
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	168	$ hg evolve --phase-divergent --confirm <<EOF
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	169	> n
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	170	> EOF
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	171	recreate:[2] tweak a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	172	atop:[1] modify a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	173	perform evolve? [Ny] n
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	174	abort: evolve aborted by user
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	175	[255]
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	176
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	177	testing the --dry-run option
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	178
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	179	$ hg evolve --phase-divergent --dry-run
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	180	recreate:[2] tweak a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	181	atop:[1] modify a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	182	hg rebase --rev 98bb3a6cfe1a --dest d3873e73d99e;
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	183	hg update 4d1169d82e47;
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	184	hg revert --all --rev 98bb3a6cfe1a;
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	185	hg commit --msg "phase-divergent update to 98bb3a6cfe1a"
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	186
3618 2d8e39919742 tests: various comment on test-evolve-phase-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: 3617 diff changeset	187	XXX: evolve should have mentioned that draft commit is just obsoleted in favour
2d8e39919742 tests: various comment on test-evolve-phase-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: 3617 diff changeset	188	of public one. From the message it looks like a new commit is created.
2d8e39919742 tests: various comment on test-evolve-phase-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: 3617 diff changeset	189
3617 a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	190	$ hg evolve --phase-divergent
1150 2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	191	recreate:[2] tweak a
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	192	atop:[1] modify a
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	193	computing new diff
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	194	committed as 4d1169d82e47
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38) Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	195	working directory is now at 4d1169d82e47
1417 9e7da169f66e test-evolve-bumped: add new test case for merge Laurent Charignon <lcharignon@fb.com> parents: 1416 diff changeset	196
3617 a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	197	$ hg glog
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	198	@ 1:4d1169d82e47 modify a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	199	\| () public
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	200	o 0:d3873e73d99e init
a0e322641810 tests: make test-evolve-phase-divergence more descriptive Pulkit Goyal <7895pulkit@gmail.com> parents: 3610 diff changeset	201	() public
3620 1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	202
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	203	Syncying every repo with the new state
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	204	--------------------------------------
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	205
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	206	$ hg push ../public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	207	pushing to ../public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	208	searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	209	no changes found
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	210	2 new obsolescence markers
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	211	[1]
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	212	$ hg push ../private
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	213	pushing to ../private
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	214	searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	215	no changes found
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	216	2 new obsolescence markers
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	217	[1]
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	218	$ hg push ../bob
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	219	pushing to ../bob
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	220	searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	221	no changes found
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	222	2 new obsolescence markers
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	223	[1]
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	224
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	225	Creating more phase-divergence where a new resolution commit will be formed and
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	226	also testing bookmark movement
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	227	--------------------------------------------------------------------------------
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	228
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	229	Alice created a commit and push to private non-publishing repo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	230
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	231	$ echo foo > foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	232	$ hg add foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	233	$ hg ci -m "added foo to foo"
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	234	$ hg glog
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	235	@ 3:aa071e5554e3 added foo to foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	236	\| () draft
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	237	o 1:4d1169d82e47 modify a
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	238	\| () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	239	o 0:d3873e73d99e init
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	240	() public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	241
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	242	$ hg push ../private
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	243	pushing to ../private
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	244	searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	245	adding changesets
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	246	adding manifests
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	247	adding file changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	248	added 1 changesets with 1 changes to 1 files
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	249
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	250	Bob pulled from the private repo and pushed that to publishing repo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	251
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	252	$ cd ../bob
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	253	$ hg pull ../private
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	254	pulling from ../private
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	255	searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	256	adding changesets
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	257	adding manifests
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	258	adding file changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	259	added 1 changesets with 1 changes to 1 files
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	260	new changesets aa071e5554e3
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	261	(run 'hg update' to get a working copy)
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	262
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	263	$ hg push ../public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	264	pushing to ../public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	265	searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	266	adding changesets
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	267	adding manifests
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	268	adding file changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	269	added 1 changesets with 1 changes to 1 files
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	270
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	271	Alice amended that changeset and then pulled from publishing repo creating
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	272	phase-divergence
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	273
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	274	$ cd ../alice
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	275	$ echo bar >> foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	276	$ hg amend -m "added bar to foo"
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	277	$ hg bookmark bm
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	278
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	279	$ hg pull ../public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	280	pulling from ../public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	281	searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	282	no changes found
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	283	1 new phase-divergent changesets
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	284
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	285	$ hg glog
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	286	@ 4:d47f2b37ed82 added bar to foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	287	\| (bm) draft
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	288	\| o 3:aa071e5554e3 added foo to foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	289	\|/ () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	290	o 1:4d1169d82e47 modify a
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	291	\| () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	292	o 0:d3873e73d99e init
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	293	() public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	294
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	295	Resolving the new phase-divergence changeset using `hg evolve`
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	296	--------------------------------------------------------------
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	297
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	298	XXX: this should have popped up for a new commit message of the changeset or an
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	299	option should be there
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	300
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	301	XXX: we should document what should user expect where running this, writing this
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	302	test I have to go through code base to understand what will be the behavior
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	303
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	304	$ hg evolve --phase-divergent
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	305	recreate:[4] added bar to foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	306	atop:[3] added foo to foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	307	computing new diff
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	308	committed as 3d62500c673d
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	309	working directory is now at 3d62500c673d
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	310
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	311	$ hg exp
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	312	# HG changeset patch
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	313	# User test
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	314	# Date 0 0
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	315	# Thu Jan 01 00:00:00 1970 +0000
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	316	# Node ID 3d62500c673dd1c88bb09a73e86d0210aed6fcb6
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	317	# Parent aa071e5554e36080a36cfd24accd5a71e3320f1e
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	318	phase-divergent update to aa071e5554e3:
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	319
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	320	added bar to foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	321
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	322	diff -r aa071e5554e3 -r 3d62500c673d foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	323	--- a/foo Thu Jan 01 00:00:00 1970 +0000
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	324	+++ b/foo Thu Jan 01 00:00:00 1970 +0000
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	325	@@ -1,1 +1,2 @@
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	326	foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	327	+bar
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	328
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	329	XXX: the commit message is not best one, we should give option to user to modify
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	330	the commit message
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	331
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	332	$ hg glog
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	333	@ 5:3d62500c673d phase-divergent update to aa071e5554e3:
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	334	\|
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	335	\| added bar to foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	336	\| (bm) draft
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	337	o 3:aa071e5554e3 added foo to foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	338	\| () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	339	o 1:4d1169d82e47 modify a
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	340	\| () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	341	o 0:d3873e73d99e init
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	342	() public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	343
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	344	$ hg obslog -r . --all
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	345	@ 3d62500c673d (5) phase-divergent update to aa071e5554e3:
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	346	\|
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	347	x d47f2b37ed82 (4) added bar to foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	348	\| rewritten(description, parent, content) as 3d62500c673d using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	349	\|
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	350	o aa071e5554e3 (3) added foo to foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	351	rewritten(description, content) as d47f2b37ed82 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	352
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	353
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	354	Syncing all other repositories
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	355	------------------------------
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	356
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	357	These pushed should not be turned to quiet mode as the output is very helpful to
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	358	make sure everything is working fine
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	359
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	360	$ hg push ../bob
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	361	pushing to ../bob
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	362	searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	363	adding changesets
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	364	adding manifests
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	365	adding file changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	366	added 1 changesets with 1 changes to 1 files
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	367	2 new obsolescence markers
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	368
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	369	$ hg push ../private
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	370	pushing to ../private
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	371	searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	372	adding changesets
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	373	adding manifests
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	374	adding file changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	375	added 1 changesets with 1 changes to 1 files
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	376	2 new obsolescence markers
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	377
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	378	$ hg push ../public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	379	pushing to ../public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	380	searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	381	adding changesets
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	382	adding manifests
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	383	adding file changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	384	added 1 changesets with 1 changes to 1 files
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	385	2 new obsolescence markers
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	386
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	387	Creating a phasedivergence changeset where the divergent changeset changed in a
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	388	way that we rebase that on old public changeset, there will be conflicts, but
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	389	the `hg evolve` command handles it very well and uses `hg revert` logic to
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	390	prevent any conflicts
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	391	-------------------------------------------------------------------------------
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	392
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	393	Alice creates one more changeset and pushes to private repo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	394
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	395	$ echo bar > bar
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	396	$ hg ci -Aqm "added bar to bar"
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	397	$ hg push ../private
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	398	pushing to ../private
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	399	searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	400	adding changesets
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	401	adding manifests
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	402	adding file changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	403	added 1 changesets with 1 changes to 1 files
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	404
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	405	Bob pulls from private and pushes to public repo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	406	$ cd ../bob
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	407
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	408	$ hg pull ../private
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	409	pulling from ../private
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	410	searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	411	adding changesets
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	412	adding manifests
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	413	adding file changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	414	added 1 changesets with 1 changes to 1 files
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	415	new changesets b756eb10ea73
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	416	(run 'hg update' to get a working copy)
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	417
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	418	$ hg push ../public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	419	pushing to ../public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	420	searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	421	adding changesets
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	422	adding manifests
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	423	adding file changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	424	added 1 changesets with 1 changes to 1 files
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	425
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	426	Alice amends the changeset and then pull from public creating phase-divergence
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	427
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	428	$ cd ../alice
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	429	$ echo foo > bar
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	430	$ hg amend -m "foo to bar"
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	431
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	432	$ hg pull ../public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	433	pulling from ../public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	434	searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	435	no changes found
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	436	1 new phase-divergent changesets
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	437
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	438	$ hg glog
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	439	@ 7:2c3560aedead foo to bar
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	440	\| (bm) draft
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	441	\| o 6:b756eb10ea73 added bar to bar
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	442	\|/ () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	443	o 5:3d62500c673d phase-divergent update to aa071e5554e3:
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	444	\|
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	445	\| added bar to foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	446	\| () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	447	o 3:aa071e5554e3 added foo to foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	448	\| () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	449	o 1:4d1169d82e47 modify a
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	450	\| () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	451	o 0:d3873e73d99e init
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	452	() public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	453
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	454	Resolving the new phase-divergence changeset using `hg evolve`
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	455	---------------------------------------------------------------
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	456
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	457	$ hg evolve --phase-divergent
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	458	recreate:[7] foo to bar
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	459	atop:[6] added bar to bar
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	460	computing new diff
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	461	committed as 502e73736632
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	462	working directory is now at 502e73736632
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	463
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	464	$ hg exp
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	465	# HG changeset patch
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	466	# User test
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	467	# Date 0 0
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	468	# Thu Jan 01 00:00:00 1970 +0000
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	469	# Node ID 502e737366322886cf628276aa0a2796904453b4
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	470	# Parent b756eb10ea73ee4ba69c998e64a5c6e1005d74b5
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	471	phase-divergent update to b756eb10ea73:
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	472
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	473	foo to bar
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	474
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	475	diff -r b756eb10ea73 -r 502e73736632 bar
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	476	--- a/bar Thu Jan 01 00:00:00 1970 +0000
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	477	+++ b/bar Thu Jan 01 00:00:00 1970 +0000
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	478	@@ -1,1 +1,1 @@
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	479	-bar
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	480	+foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	481
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	482	$ hg glog
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	483	@ 8:502e73736632 phase-divergent update to b756eb10ea73:
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	484	\|
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	485	\| foo to bar
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	486	\| (bm) draft
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	487	o 6:b756eb10ea73 added bar to bar
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	488	\| () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	489	o 5:3d62500c673d phase-divergent update to aa071e5554e3:
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	490	\|
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	491	\| added bar to foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	492	\| () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	493	o 3:aa071e5554e3 added foo to foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	494	\| () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	495	o 1:4d1169d82e47 modify a
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	496	\| () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	497	o 0:d3873e73d99e init
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3619 diff changeset	498	() public

author	Pulkit Goyal <7895pulkit@gmail.com>
	Fri, 23 Mar 2018 15:27:26 +0530
changeset 3620	1f020455f6fe
parent 3619	914d3cf8d392
child 3621	db3ec5f79ab9
permissions	-rw-r--r--