evolve: tests/test-evolve-public-content-divergent-corner-cases.t@d1d8e97d32af (annotated)

4530 d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	1	===============================================================
d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	2	Tests the resolution of public content divergence: corner cases
d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	3	===============================================================
d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	4
d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	5	This file intend to cover cases that are specific enough to not fit in the
d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	6	other cases.
4383 3343eac099ec evolve: add logic to resolve content-divergence with a public cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: diff changeset	7
3343eac099ec evolve: add logic to resolve content-divergence with a public cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: diff changeset	8	Setup
3343eac099ec evolve: add logic to resolve content-divergence with a public cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: diff changeset	9	=====
3343eac099ec evolve: add logic to resolve content-divergence with a public cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: diff changeset	10	$ cat >> $HGRCPATH <<EOF
3343eac099ec evolve: add logic to resolve content-divergence with a public cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: diff changeset	11	> [alias]
4625 a4fde4e3e763 templatekw: add `instabilities` alias for `troubles` Matt Harbison <matt_harbison@yahoo.com> parents: 4607 diff changeset	12	> glog = log -GT "{rev}:{node\|short} {desc\|firstline}\n {phase} {instabilities}\n\n"
4383 3343eac099ec evolve: add logic to resolve content-divergence with a public cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: diff changeset	13	> [phases]
3343eac099ec evolve: add logic to resolve content-divergence with a public cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: diff changeset	14	> publish = False
3343eac099ec evolve: add logic to resolve content-divergence with a public cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: diff changeset	15	> [extensions]
3343eac099ec evolve: add logic to resolve content-divergence with a public cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: diff changeset	16	> rebase =
3343eac099ec evolve: add logic to resolve content-divergence with a public cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: diff changeset	17	> EOF
3343eac099ec evolve: add logic to resolve content-divergence with a public cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: diff changeset	18	$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
3343eac099ec evolve: add logic to resolve content-divergence with a public cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: diff changeset	19
4530 d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	20	Testing when divergence is not created by actual diff change, but because of rebasing:
d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	21	--------------------------------------------------------------------------------------
4385 34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	22
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	23	Prepare the repo:
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	24
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	25	$ hg init rebasediv
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	26	$ cd rebasediv
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	27	$ for ch in a b c; do
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	28	> echo $ch > $ch;
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	29	> hg ci -Am "added "$ch;
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	30	> done;
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	31	adding a
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	32	adding b
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	33	adding c
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	34
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	35	$ hg glog
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	36	@ 2:155349b645be added c
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	37	\| draft
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	38	\|
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	39	o 1:5f6d8a4bf34a added b
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	40	\| draft
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	41	\|
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	42	o 0:9092f1db7931 added a
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	43	draft
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	44
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	45
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	46	On server side: a new cset is added based on rev 1 and rev 2 is rebased on newly added cset:
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	47
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	48	$ hg up .^ -q
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	49	$ echo d > d
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	50	$ hg ci -Am "added d"
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	51	adding d
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	52	created new head
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	53
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	54	$ hg rebase -r 2 -d .
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	55	rebasing 2:155349b645be "added c"
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	56
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	57	$ hg glog
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	58	o 4:c0d7ee6604ea added c
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	59	\| draft
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	60	\|
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	61	@ 3:c9241b0f2d5b added d
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	62	\| draft
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	63	\|
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	64	o 1:5f6d8a4bf34a added b
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	65	\| draft
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	66	\|
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	67	o 0:9092f1db7931 added a
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	68	draft
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	69
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	70
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	71	On user side: user has not pulled yet and amended the rev 2 which created the divergence after pull:
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	72	$ hg up 2 --hidden -q
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	73	updated to hidden changeset 155349b645be
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	74	(hidden revision '155349b645be' was rewritten as: c0d7ee6604ea)
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	75	working directory parent is obsolete! (155349b645be)
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	76
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	77	$ echo cc >> c
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	78	$ hg ci --amend -m "updated c"
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	79	2 new content-divergent changesets
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	80
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	81	Lets change the phase to --public of branch which is pulled from server:
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	82	$ hg phase --public -r 4
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	83	$ hg glog -p
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	84	@ 5:f5f9b4fc8b77 updated c
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	85	\| draft content-divergent
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	86	\|
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	87	\| diff -r 5f6d8a4bf34a -r f5f9b4fc8b77 c
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	88	\| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	89	\| +++ b/c Thu Jan 01 00:00:00 1970 +0000
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	90	\| @@ -0,0 +1,2 @@
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	91	\| +c
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	92	\| +cc
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	93	\|
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	94	\| o 4:c0d7ee6604ea added c
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	95	\| \| public
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	96	\| \|
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	97	\| \| diff -r c9241b0f2d5b -r c0d7ee6604ea c
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	98	\| \| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	99	\| \| +++ b/c Thu Jan 01 00:00:00 1970 +0000
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	100	\| \| @@ -0,0 +1,1 @@
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	101	\| \| +c
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	102	\| \|
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	103	\| o 3:c9241b0f2d5b added d
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	104	\|/ public
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	105	\|
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	106	\| diff -r 5f6d8a4bf34a -r c9241b0f2d5b d
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	107	\| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	108	\| +++ b/d Thu Jan 01 00:00:00 1970 +0000
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	109	\| @@ -0,0 +1,1 @@
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	110	\| +d
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	111	\|
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	112	o 1:5f6d8a4bf34a added b
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	113	\| public
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	114	\|
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	115	\| diff -r 9092f1db7931 -r 5f6d8a4bf34a b
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	116	\| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	117	\| +++ b/b Thu Jan 01 00:00:00 1970 +0000
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	118	\| @@ -0,0 +1,1 @@
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	119	\| +b
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	120	\|
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	121	o 0:9092f1db7931 added a
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	122	public
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	123
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	124	diff -r 000000000000 -r 9092f1db7931 a
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	125	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	126	+++ b/a Thu Jan 01 00:00:00 1970 +0000
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	127	@@ -0,0 +1,1 @@
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	128	+a
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	129
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	130
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	131	Evolve:
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	132	$ hg evolve --content-divergent
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	133	merge:[4] added c
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	134	with: [5] updated c
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	135	base: [2] added c
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	136	rebasing "other" content-divergent changeset f5f9b4fc8b77 on c9241b0f2d5b
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	137	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	138	committed as 3b336cbee992
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	139	working directory is now at 3b336cbee992
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	140
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	141	$ hg glog -p
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	142	@ 8:3b336cbee992 phase-divergent update to c0d7ee6604ea:
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	143	\| draft
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	144	\|
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	145	\| diff -r c0d7ee6604ea -r 3b336cbee992 c
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	146	\| --- a/c Thu Jan 01 00:00:00 1970 +0000
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	147	\| +++ b/c Thu Jan 01 00:00:00 1970 +0000
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	148	\| @@ -1,1 +1,2 @@
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	149	\| c
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	150	\| +cc
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	151	\|
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	152	o 4:c0d7ee6604ea added c
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	153	\| public
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	154	\|
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	155	\| diff -r c9241b0f2d5b -r c0d7ee6604ea c
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	156	\| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	157	\| +++ b/c Thu Jan 01 00:00:00 1970 +0000
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	158	\| @@ -0,0 +1,1 @@
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	159	\| +c
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	160	\|
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	161	o 3:c9241b0f2d5b added d
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	162	\| public
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	163	\|
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	164	\| diff -r 5f6d8a4bf34a -r c9241b0f2d5b d
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	165	\| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	166	\| +++ b/d Thu Jan 01 00:00:00 1970 +0000
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	167	\| @@ -0,0 +1,1 @@
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	168	\| +d
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	169	\|
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	170	o 1:5f6d8a4bf34a added b
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	171	\| public
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	172	\|
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	173	\| diff -r 9092f1db7931 -r 5f6d8a4bf34a b
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	174	\| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	175	\| +++ b/b Thu Jan 01 00:00:00 1970 +0000
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	176	\| @@ -0,0 +1,1 @@
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	177	\| +b
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	178	\|
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	179	o 0:9092f1db7931 added a
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	180	public
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	181
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	182	diff -r 000000000000 -r 9092f1db7931 a
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	183	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	184	+++ b/a Thu Jan 01 00:00:00 1970 +0000
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	185	@@ -0,0 +1,1 @@
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	186	+a
34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	187
4471 3caa4a459439 tests: use current instability names everywhere Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4454 diff changeset	188	Check that we don't have any unstable cset now:
4385 34322fb3afca evolve: add test for the case where public divergence on difference parents Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4384 diff changeset	189	$ hg evolve -l
4412 dcbe64c954dc evolve: add tests of relocation case in public divergence Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4385 diff changeset	190	$ cd ..
dcbe64c954dc evolve: add tests of relocation case in public divergence Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4385 diff changeset	191
4473 14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	192	Different parent, simple conflict on relocate, deleted file on actual merge
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	193	---------------------------------------------------------------------------
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	194
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	195	Changeset "added c e" is also removing 'd'. This should conflict with the update
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	196	to 'd' in the successors of 'adding d' when solving the content divergence.
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	197
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	198	$ hg init pubdiv-parent-deleted-file
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	199	$ cd pubdiv-parent-deleted-file
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	200	$ for ch in a b c d; do
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	201	> echo $ch > $ch;
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	202	> hg ci -Aqm "added "$ch;
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	203	> done;
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	204
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	205	$ hg up 'desc("added b")'
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	206	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	207	$ echo cfoo > c
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	208	$ echo e > e
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	209	$ hg add c e
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	210	$ hg ci -m "added c e"
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	211	created new head
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	212
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	213	$ hg up 'desc("re:added c$")'
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	214	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	215	$ echo dd > d
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	216	$ hg add d
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	217	$ hg ci -m "added d"
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	218	created new head
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	219
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	220	$ hg glog --patch --rev 'sort(all(), "topo")'
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	221	@ 5:93cd84bbdaca added d
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	222	\| draft
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	223	\|
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	224	\| diff -r 155349b645be -r 93cd84bbdaca d
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	225	\| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	226	\| +++ b/d Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	227	\| @@ -0,0 +1,1 @@
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	228	\| +dd
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	229	\|
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	230	\| o 3:9150fe93bec6 added d
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	231	\|/ draft
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	232	\|
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	233	\| diff -r 155349b645be -r 9150fe93bec6 d
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	234	\| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	235	\| +++ b/d Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	236	\| @@ -0,0 +1,1 @@
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	237	\| +d
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	238	\|
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	239	o 2:155349b645be added c
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	240	\| draft
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	241	\|
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	242	\| diff -r 5f6d8a4bf34a -r 155349b645be c
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	243	\| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	244	\| +++ b/c Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	245	\| @@ -0,0 +1,1 @@
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	246	\| +c
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	247	\|
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	248	\| o 4:e568fd1029bb added c e
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	249	\|/ draft
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	250	\|
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	251	\| diff -r 5f6d8a4bf34a -r e568fd1029bb c
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	252	\| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	253	\| +++ b/c Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	254	\| @@ -0,0 +1,1 @@
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	255	\| +cfoo
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	256	\| diff -r 5f6d8a4bf34a -r e568fd1029bb e
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	257	\| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	258	\| +++ b/e Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	259	\| @@ -0,0 +1,1 @@
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	260	\| +e
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	261	\|
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	262	o 1:5f6d8a4bf34a added b
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	263	\| draft
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	264	\|
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	265	\| diff -r 9092f1db7931 -r 5f6d8a4bf34a b
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	266	\| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	267	\| +++ b/b Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	268	\| @@ -0,0 +1,1 @@
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	269	\| +b
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	270	\|
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	271	o 0:9092f1db7931 added a
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	272	draft
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	273
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	274	diff -r 000000000000 -r 9092f1db7931 a
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	275	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	276	+++ b/a Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	277	@@ -0,0 +1,1 @@
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	278	+a
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	279
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	280	$ hg prune 'min(desc("added d"))' -s 'max(desc("added d"))'
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	281	1 changesets pruned
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	282	$ hg prune 'min(desc("added d"))' -s 'desc("added c e")' --hidden
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	283	1 changesets pruned
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	284	2 new content-divergent changesets
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	285
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	286	Change phase to public for one head:
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	287	$ hg phase --public -r 'max(desc("added d"))'
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	288
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	289	$ hg glog
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	290	@ 5:93cd84bbdaca added d
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	291	\| public
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	292	\|
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	293	\| * 4:e568fd1029bb added c e
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	294	\| \| draft content-divergent
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	295	\| \|
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	296	o \| 2:155349b645be added c
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	297	\|/ public
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	298	\|
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	299	o 1:5f6d8a4bf34a added b
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	300	\| public
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	301	\|
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	302	o 0:9092f1db7931 added a
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	303	public
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	304
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	305
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	306	$ hg glog --patch --rev 'sort(all(), "topo")' --hidden
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	307	@ 5:93cd84bbdaca added d
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	308	\| public
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	309	\|
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	310	\| diff -r 155349b645be -r 93cd84bbdaca d
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	311	\| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	312	\| +++ b/d Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	313	\| @@ -0,0 +1,1 @@
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	314	\| +dd
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	315	\|
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	316	\| x 3:9150fe93bec6 added d
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	317	\|/ draft
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	318	\|
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	319	\| diff -r 155349b645be -r 9150fe93bec6 d
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	320	\| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	321	\| +++ b/d Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	322	\| @@ -0,0 +1,1 @@
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	323	\| +d
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	324	\|
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	325	o 2:155349b645be added c
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	326	\| public
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	327	\|
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	328	\| diff -r 5f6d8a4bf34a -r 155349b645be c
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	329	\| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	330	\| +++ b/c Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	331	\| @@ -0,0 +1,1 @@
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	332	\| +c
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	333	\|
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	334	\| * 4:e568fd1029bb added c e
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	335	\|/ draft content-divergent
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	336	\|
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	337	\| diff -r 5f6d8a4bf34a -r e568fd1029bb c
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	338	\| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	339	\| +++ b/c Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	340	\| @@ -0,0 +1,1 @@
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	341	\| +cfoo
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	342	\| diff -r 5f6d8a4bf34a -r e568fd1029bb e
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	343	\| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	344	\| +++ b/e Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	345	\| @@ -0,0 +1,1 @@
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	346	\| +e
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	347	\|
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	348	o 1:5f6d8a4bf34a added b
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	349	\| public
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	350	\|
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	351	\| diff -r 9092f1db7931 -r 5f6d8a4bf34a b
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	352	\| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	353	\| +++ b/b Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	354	\| @@ -0,0 +1,1 @@
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	355	\| +b
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	356	\|
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	357	o 0:9092f1db7931 added a
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	358	public
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	359
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	360	diff -r 000000000000 -r 9092f1db7931 a
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	361	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	362	+++ b/a Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	363	@@ -0,0 +1,1 @@
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	364	+a
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	365
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	366
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	367	$ hg obslog --all --rev tip --patch
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	368	@ 93cd84bbdaca (5) added d
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	369	\|
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	370	\| * e568fd1029bb (4) added c e
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	371	\|/
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	372	x 9150fe93bec6 (3) added d
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	373	rewritten(content) as 93cd84bbdaca using prune by test (Thu Jan 01 00:00:00 1970 +0000)
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	374	diff -r 9150fe93bec6 -r 93cd84bbdaca d
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	375	--- a/d Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	376	+++ b/d Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	377	@@ -1,1 +1,1 @@
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	378	-d
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	379	+dd
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	380
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	381	rewritten(description, parent, content) as e568fd1029bb using prune by test (Thu Jan 01 00:00:00 1970 +0000)
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	382	(No patch available, changesets rebased)
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	383
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	384
4576 96ce1030d2fb tests: add --update to hg evolve to reduce test changes for the next patch Anton Shestakov <av6@dwimlabs.net> parents: 4530 diff changeset	385	$ hg evolve --content-divergent --any --update
4473 14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	386	merge:[5] added d
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	387	with: [4] added c e
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	388	base: [3] added d
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	389	rebasing "other" content-divergent changeset e568fd1029bb on 155349b645be
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	390	merging c
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	391	warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
4676 b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them Anton Shestakov <av6@dwimlabs.net> parents: 4660 diff changeset	392	unresolved merge conflicts
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them Anton Shestakov <av6@dwimlabs.net> parents: 4660 diff changeset	393	(see 'hg help evolve.interrupted')
4473 14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	394	[1]
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	395
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	396	$ hg diff
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	397	diff -r 155349b645be c
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	398	--- a/c Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	399	+++ b/c Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	400	@@ -1,1 +1,5 @@
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	401	+<<<<<<< destination: 155349b645be - test: added c
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	402	c
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	403	+=======
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	404	+cfoo
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	405	+>>>>>>> evolving: e568fd1029bb - test: added c e
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	406	diff -r 155349b645be e
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	407	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	408	+++ b/e Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	409	@@ -0,0 +1,1 @@
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	410	+e
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	411
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	412	$ echo c > c
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	413	$ hg res -m
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	414	(no more unresolved files)
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	415	continue: hg evolve --continue
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	416
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	417	$ hg evolve --continue
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	418	evolving 4:e568fd1029bb "added c e"
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	419	file 'd' was deleted in other but was modified in local.
4711 88c8ef4d703c tests: update output for shorted prompts from Mercurial Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4676 diff changeset	420	You can use (c)hanged version, (d)elete, or leave (u)nresolved.
88c8ef4d703c tests: update output for shorted prompts from Mercurial Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4676 diff changeset	421	What do you want to do? u
4473 14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	422	1 files updated, 0 files merged, 0 files removed, 1 files unresolved
4676 b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them Anton Shestakov <av6@dwimlabs.net> parents: 4660 diff changeset	423	unresolved merge conflicts
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them Anton Shestakov <av6@dwimlabs.net> parents: 4660 diff changeset	424	(see 'hg help evolve.interrupted')
4473 14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	425	[1]
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	426
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	427	$ hg sum
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	428	parent: 5:93cd84bbdaca
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	429	added d
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	430	parent: 6:2af3359250d3 tip (content-divergent)
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	431	added c e
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	432	branch: default
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	433	commit: 1 modified, 1 unknown, 1 unresolved (merge)
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	434	update: (current)
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	435	phases: 1 draft
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	436	content-divergent: 1 changesets
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	437	evolve: (evolve --continue)
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	438
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	439	$ echo resolved > d
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	440	$ hg resolve -m d
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	441	(no more unresolved files)
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	442	continue: hg evolve --continue
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	443
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	444	$ hg evolve --continue
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	445	committed as bc1f4610744c
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	446	working directory is now at bc1f4610744c
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	447
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	448	$ hg export
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	449	# HG changeset patch
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	450	# User test
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	451	# Date 0 0
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	452	# Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	453	# Node ID bc1f4610744c6aa0e851d3876a61bfff6243b31c
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	454	# Parent 93cd84bbdacaeb8f881c29a609dbdd30c38cbc57
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	455	phase-divergent update to 93cd84bbdaca:
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	456
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	457	added c e
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	458
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	459	diff -r 93cd84bbdaca -r bc1f4610744c d
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	460	--- a/d Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	461	+++ b/d Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	462	@@ -1,1 +1,1 @@
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	463	-dd
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	464	+resolved
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	465	diff -r 93cd84bbdaca -r bc1f4610744c e
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	466	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	467	+++ b/e Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	468	@@ -0,0 +1,1 @@
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	469	+e
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	470
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	471	$ hg evolve -l
14437b18b024 evolve: fix divergence resolution when not merging a descendant Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4472 diff changeset	472	$ cd ..
4416 b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	473
4444 ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	474	Test a pratical "rebase" case
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	475	=============================
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	476
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	477	Initial setup
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	478
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	479	$ hg init rebase-divergence
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	480	$ cd rebase-divergence
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	481	$ echo root >> root
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	482	$ hg add root
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	483	$ hg commit -m root
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	484	$ for x in c_A c_B c_C c_D; do
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	485	> echo $x >> $x
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	486	> hg add $x
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	487	> hg commit -m $x
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	488	> done
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	489
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	490	$ hg up 'desc("c_A")'
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	491	0 files updated, 0 files merged, 3 files removed, 0 files unresolved
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	492
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	493	$ for x in c_E c_F; do
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	494	> echo $x >> $x
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	495	> hg add $x
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	496	> hg commit -m $x
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	497	> done
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	498	created new head
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	499
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	500	(creating divergence locally for simplicity)
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	501
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	502	$ node=`hg log --rev 'desc("c_E")' -T '{node}'`
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	503	$ hg rebase -s $node -d 'desc("c_B")'
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	504	rebasing 5:4ab2719bbab9 "c_E"
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	505	rebasing 6:77ccbf8d837e "c_F" (tip)
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	506	$ hg phase --public tip
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	507	$ hg rebase --hidden -s $node -d 'desc("c_C")' --config experimental.evolution.allowdivergence=yes
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	508	rebasing 5:4ab2719bbab9 "c_E"
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	509	rebasing 6:77ccbf8d837e "c_F"
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	510	2 new content-divergent changesets
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	511
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	512	$ hg sum
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	513	parent: 8:a52ac76b45f5
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	514	c_F
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	515	branch: default
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	516	commit: (clean)
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	517	update: 4 new changesets, 3 branch heads (merge)
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	518	phases: 4 draft
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	519	content-divergent: 2 changesets
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	520	$ hg evolve --list
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	521	b4a584aea4bd: c_E
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	522	content-divergent: c7d2d47c7240 (public) (precursor 4ab2719bbab9)
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	523
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	524	8ae8db670b4a: c_F
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	525	content-divergent: a52ac76b45f5 (public) (precursor 77ccbf8d837e)
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	526
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	527	$ hg log -G --patch
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	528	* changeset: 10:8ae8db670b4a
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	529	\| tag: tip
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	530	\| user: test
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	531	\| date: Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	532	\| instability: content-divergent
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	533	\| summary: c_F
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	534	\|
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	535	\| diff -r b4a584aea4bd -r 8ae8db670b4a c_F
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	536	\| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	537	\| +++ b/c_F Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	538	\| @@ -0,0 +1,1 @@
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	539	\| +c_F
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	540	\|
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	541	* changeset: 9:b4a584aea4bd
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	542	\| parent: 3:abb77b893f28
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	543	\| user: test
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	544	\| date: Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	545	\| instability: content-divergent
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	546	\| summary: c_E
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	547	\|
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	548	\| diff -r abb77b893f28 -r b4a584aea4bd c_E
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	549	\| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	550	\| +++ b/c_E Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	551	\| @@ -0,0 +1,1 @@
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	552	\| +c_E
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	553	\|
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	554	\| @ changeset: 8:a52ac76b45f5
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	555	\| \| user: test
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	556	\| \| date: Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	557	\| \| summary: c_F
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	558	\| \|
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	559	\| \| diff -r c7d2d47c7240 -r a52ac76b45f5 c_F
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	560	\| \| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	561	\| \| +++ b/c_F Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	562	\| \| @@ -0,0 +1,1 @@
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	563	\| \| +c_F
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	564	\| \|
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	565	\| o changeset: 7:c7d2d47c7240
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	566	\| \| parent: 2:eb1b4e1205b8
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	567	\| \| user: test
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	568	\| \| date: Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	569	\| \| summary: c_E
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	570	\| \|
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	571	\| \| diff -r eb1b4e1205b8 -r c7d2d47c7240 c_E
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	572	\| \| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	573	\| \| +++ b/c_E Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	574	\| \| @@ -0,0 +1,1 @@
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	575	\| \| +c_E
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	576	\| \|
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	577	+---o changeset: 4:dbb960d6c97c
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	578	\| \| user: test
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	579	\| \| date: Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	580	\| \| summary: c_D
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	581	\| \|
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	582	\| \| diff -r abb77b893f28 -r dbb960d6c97c c_D
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	583	\| \| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	584	\| \| +++ b/c_D Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	585	\| \| @@ -0,0 +1,1 @@
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	586	\| \| +c_D
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	587	\| \|
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	588	o \| changeset: 3:abb77b893f28
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	589	\|/ user: test
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	590	\| date: Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	591	\| summary: c_C
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	592	\|
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	593	\| diff -r eb1b4e1205b8 -r abb77b893f28 c_C
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	594	\| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	595	\| +++ b/c_C Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	596	\| @@ -0,0 +1,1 @@
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	597	\| +c_C
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	598	\|
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	599	o changeset: 2:eb1b4e1205b8
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	600	\| user: test
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	601	\| date: Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	602	\| summary: c_B
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	603	\|
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	604	\| diff -r e31751786014 -r eb1b4e1205b8 c_B
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	605	\| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	606	\| +++ b/c_B Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	607	\| @@ -0,0 +1,1 @@
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	608	\| +c_B
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	609	\|
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	610	o changeset: 1:e31751786014
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	611	\| user: test
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	612	\| date: Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	613	\| summary: c_A
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	614	\|
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	615	\| diff -r 1e4be0697311 -r e31751786014 c_A
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	616	\| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	617	\| +++ b/c_A Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	618	\| @@ -0,0 +1,1 @@
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	619	\| +c_A
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	620	\|
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	621	o changeset: 0:1e4be0697311
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	622	user: test
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	623	date: Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	624	summary: root
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	625
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	626	diff -r 000000000000 -r 1e4be0697311 root
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	627	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	628	+++ b/root Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	629	@@ -0,0 +1,1 @@
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	630	+root
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	631
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	632
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	633	Run automatic evolution
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	634
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	635	$ hg evolve --content-divergent --rev 'not public() and desc("c_E")::'
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	636	merge:[7] c_E
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	637	with: [9] c_E
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	638	base: [5] c_E
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	639	rebasing "other" content-divergent changeset b4a584aea4bd on eb1b4e1205b8
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	640	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
4583 4fcf9a71befc evolve: show a status message when merging leads to public cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4576 diff changeset	641	content divergence resolution between c7d2d47c7240 (public) and 0773642cfa95 has same content as c7d2d47c7240, discarding 0773642cfa95
4444 ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	642	merge:[8] c_F
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	643	with: [10] c_F
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	644	base: [6] c_F
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	645	rebasing "other" content-divergent changeset 8ae8db670b4a on c7d2d47c7240
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	646	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
4583 4fcf9a71befc evolve: show a status message when merging leads to public cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4576 diff changeset	647	content divergence resolution between a52ac76b45f5 (public) and 6a87ed4aa317 has same content as a52ac76b45f5, discarding 6a87ed4aa317
4444 ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	648	$ hg sum
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	649	parent: 8:a52ac76b45f5 tip
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	650	c_F
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	651	branch: default
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	652	commit: (clean)
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	653	update: 2 new changesets, 2 branch heads (merge)
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	654	phases: 2 draft
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	655
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	656	$ hg evolve --list
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	657
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	658	$ hg log -G --patch
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	659	@ changeset: 8:a52ac76b45f5
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	660	\| tag: tip
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	661	\| user: test
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	662	\| date: Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	663	\| summary: c_F
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	664	\|
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	665	\| diff -r c7d2d47c7240 -r a52ac76b45f5 c_F
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	666	\| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	667	\| +++ b/c_F Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	668	\| @@ -0,0 +1,1 @@
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	669	\| +c_F
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	670	\|
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	671	o changeset: 7:c7d2d47c7240
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	672	\| parent: 2:eb1b4e1205b8
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	673	\| user: test
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	674	\| date: Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	675	\| summary: c_E
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	676	\|
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	677	\| diff -r eb1b4e1205b8 -r c7d2d47c7240 c_E
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	678	\| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	679	\| +++ b/c_E Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	680	\| @@ -0,0 +1,1 @@
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	681	\| +c_E
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	682	\|
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	683	\| o changeset: 4:dbb960d6c97c
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	684	\| \| user: test
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	685	\| \| date: Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	686	\| \| summary: c_D
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	687	\| \|
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	688	\| \| diff -r abb77b893f28 -r dbb960d6c97c c_D
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	689	\| \| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	690	\| \| +++ b/c_D Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	691	\| \| @@ -0,0 +1,1 @@
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	692	\| \| +c_D
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	693	\| \|
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	694	\| o changeset: 3:abb77b893f28
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	695	\|/ user: test
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	696	\| date: Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	697	\| summary: c_C
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	698	\|
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	699	\| diff -r eb1b4e1205b8 -r abb77b893f28 c_C
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	700	\| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	701	\| +++ b/c_C Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	702	\| @@ -0,0 +1,1 @@
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	703	\| +c_C
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	704	\|
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	705	o changeset: 2:eb1b4e1205b8
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	706	\| user: test
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	707	\| date: Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	708	\| summary: c_B
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	709	\|
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	710	\| diff -r e31751786014 -r eb1b4e1205b8 c_B
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	711	\| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	712	\| +++ b/c_B Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	713	\| @@ -0,0 +1,1 @@
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	714	\| +c_B
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	715	\|
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	716	o changeset: 1:e31751786014
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	717	\| user: test
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	718	\| date: Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	719	\| summary: c_A
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	720	\|
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	721	\| diff -r 1e4be0697311 -r e31751786014 c_A
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	722	\| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	723	\| +++ b/c_A Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	724	\| @@ -0,0 +1,1 @@
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	725	\| +c_A
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	726	\|
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	727	o changeset: 0:1e4be0697311
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	728	user: test
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	729	date: Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	730	summary: root
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	731
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	732	diff -r 000000000000 -r 1e4be0697311 root
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	733	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	734	+++ b/root Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	735	@@ -0,0 +1,1 @@
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	736	+root
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	737
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	738	$ hg export tip
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	739	# HG changeset patch
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	740	# User test
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	741	# Date 0 0
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	742	# Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	743	# Node ID a52ac76b45f523a039fc4a938d79874f4bdb1a85
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	744	# Parent c7d2d47c7240562be5cbd1a24080dd0396178709
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	745	c_F
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	746
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	747	diff -r c7d2d47c7240 -r a52ac76b45f5 c_F
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	748	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	749	+++ b/c_F Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	750	@@ -0,0 +1,1 @@
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	751	+c_F
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	752
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	753	$ hg obslog --rev a52ac76b45f5
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	754	@ a52ac76b45f5 (8) c_F
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	755	\|\
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	756	x \| 6a87ed4aa317 (12) c_F
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	757	\| \| rewritten as a52ac76b45f5 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	758	\| \|
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	759	x \| 8ae8db670b4a (10) c_F
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	760	\|/ rewritten(parent) as 6a87ed4aa317 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	761	\|
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	762	x 77ccbf8d837e (6) c_F
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	763	rewritten(parent) as 8ae8db670b4a using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	764	rewritten(parent) as a52ac76b45f5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	765

author	Martin von Zweigbergk <martinvonz@google.com>
	Mon, 04 Nov 2019 14:31:08 -0800
changeset 4917	d1d8e97d32af
parent 4711	88c8ef4d703c
child 4778	1340d6718a88
child 5079	1f92a6aa40d6
child 5240	6f5e6253324f
permissions	-rw-r--r--