evolve: tests/test-evolve-public-content-divergent-discard.t@a4fde4e3e763 (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: when merging leads to public
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 all the cases possible when merging the other
d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	6	divergent cset into public cset leads to public cset itself.
d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	7	Possible variants are:
d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	8
d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	9	parent: same/different
d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	10	relocation: [no-]conflict
d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	11	merging: [no-]conflict
4383 3343eac099ec evolve: add logic to resolve content-divergence with a public cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: diff changeset	12
3343eac099ec evolve: add logic to resolve content-divergence with a public cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: diff changeset	13	Setup
3343eac099ec evolve: add logic to resolve content-divergence with a public cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: diff changeset	14	=====
3343eac099ec evolve: add logic to resolve content-divergence with a public cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: diff changeset	15	$ cat >> $HGRCPATH <<EOF
3343eac099ec evolve: add logic to resolve content-divergence with a public cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: diff changeset	16	> [alias]
4625 a4fde4e3e763 templatekw: add `instabilities` alias for `troubles` Matt Harbison <matt_harbison@yahoo.com> parents: 4584 diff changeset	17	> 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	18	> [phases]
3343eac099ec evolve: add logic to resolve content-divergence with a public cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: diff changeset	19	> publish = False
3343eac099ec evolve: add logic to resolve content-divergence with a public cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: diff changeset	20	> [extensions]
3343eac099ec evolve: add logic to resolve content-divergence with a public cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: diff changeset	21	> rebase =
3343eac099ec evolve: add logic to resolve content-divergence with a public cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: diff changeset	22	> EOF
3343eac099ec evolve: add logic to resolve content-divergence with a public cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: diff changeset	23	$ 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	24
4530 d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	25	Testing when same parent, no conflict:
d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	26	--------------------------------------
4384 8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4383 diff changeset	27
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4383 diff changeset	28	$ hg init pubdiv1
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4383 diff changeset	29	$ cd pubdiv1
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	30	$ for ch in a b c; do
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	31	> echo $ch > $ch;
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	32	> hg ci -Am "added "$ch;
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	33	> done;
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	34	adding a
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	35	adding b
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	36	adding c
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	37
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	38	$ hg up .^
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	39	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	40	$ echo ch > ch
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	41	$ hg add ch
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	42	$ hg ci -m "added ch"
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	43	created new head
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	44
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	45	$ hg up .^
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	46	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	47	$ echo ch > ch
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	48	$ hg add ch
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	49	$ hg ci -m "added c"
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	50	created new head
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	51
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	52	$ hg glog
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	53	@ 4:f7c1071f1e7c added c
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	54	\| draft
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	55	\|
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	56	\| o 3:90522bccf499 added ch
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	57	\|/ draft
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	58	\|
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	59	\| o 2:155349b645be added c
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	60	\|/ draft
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	61	\|
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	62	o 1:5f6d8a4bf34a added b
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	63	\| draft
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	64	\|
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	65	o 0:9092f1db7931 added a
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	66	draft
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	67
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	68
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	69	$ hg prune 2 -s 3
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	70	1 changesets pruned
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	71	$ hg prune 2 -s 4 --hidden
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	72	1 changesets pruned
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	73	2 new content-divergent changesets
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	74	$ hg phase --public -r 4
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	75
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	76	$ hg glog
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	77	@ 4:f7c1071f1e7c added c
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	78	\| public
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	79	\|
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	80	\| * 3:90522bccf499 added ch
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	81	\|/ draft content-divergent
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	82	\|
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	83	o 1:5f6d8a4bf34a added b
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	84	\| public
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	85	\|
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	86	o 0:9092f1db7931 added a
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	87	public
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	88
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	89	$ hg evolve --content-divergent --any
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	90	merge:[4] added c
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	91	with: [3] added ch
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	92	base: [2] added c
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	93	merging "other" content-divergent changeset '90522bccf499'
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	94	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
4584 fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	95	other divergent changeset 90522bccf499 has same content as local f7c1071f1e7c and differs by "description" only, discarding 90522bccf499
4583 4fcf9a71befc evolve: show a status message when merging leads to public cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4582 diff changeset	96	content divergence resolution between f7c1071f1e7c (public) and 90522bccf499 has same content as f7c1071f1e7c, discarding 90522bccf499
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	97
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	98	$ hg evolve -l
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	99
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	100	$ hg par
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	101	changeset: 4:f7c1071f1e7c
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	102	tag: tip
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	103	parent: 1:5f6d8a4bf34a
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	104	user: test
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	105	date: Thu Jan 01 00:00:00 1970 +0000
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	106	summary: added c
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	107
4530 d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	108	$ 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	109
4530 d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	110	Testing when different parent, no conflict:
d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	111	-------------------------------------------
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	112
4530 d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	113	$ hg init pubdiv2
d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	114	$ cd pubdiv2
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	115	$ for ch in a b c d; do
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	116	> echo $ch > $ch;
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	117	> hg ci -Am "added "$ch;
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	118	> done;
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	119	adding a
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	120	adding b
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	121	adding c
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	122	adding d
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	123
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	124	$ hg up 1
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	125	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	126	$ echo dh > dh
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	127	$ hg add dh
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	128	$ hg ci -m "added dh"
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	129	created new head
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	130
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	131	$ hg up 2
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	132	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	133	$ echo dh > dh
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	134	$ hg add dh
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	135	$ hg ci -m "added d"
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	136	created new head
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	137
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	138	$ hg glog
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	139	@ 5:e800202333a4 added d
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	140	\| draft
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	141	\|
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	142	\| o 4:5acd58ef5066 added dh
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	143	\| \| draft
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	144	\| \|
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	145	+---o 3:9150fe93bec6 added d
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	146	\| \| draft
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	147	\| \|
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	148	o \| 2:155349b645be added c
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	149	\|/ draft
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	150	\|
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	151	o 1:5f6d8a4bf34a added b
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	152	\| draft
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	153	\|
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	154	o 0:9092f1db7931 added a
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	155	draft
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	156
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	157
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	158	$ hg prune 3 -s 4
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	159	1 changesets pruned
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	160	$ hg prune 3 -s 5 --hidden
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	161	1 changesets pruned
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	162	2 new content-divergent changesets
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	163	$ hg phase --public -r 5
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	164
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	165	$ hg glog
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	166	@ 5:e800202333a4 added d
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	167	\| public
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	168	\|
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	169	\| * 4:5acd58ef5066 added dh
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	170	\| \| draft content-divergent
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	171	\| \|
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	172	o \| 2:155349b645be added c
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	173	\|/ public
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	174	\|
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	175	o 1:5f6d8a4bf34a added b
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	176	\| public
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	177	\|
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	178	o 0:9092f1db7931 added a
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	179	public
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	180
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	181	$ hg evolve --content-divergent --any
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	182	merge:[5] added d
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	183	with: [4] added dh
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	184	base: [3] added d
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	185	rebasing "other" content-divergent changeset 5acd58ef5066 on 155349b645be
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	186	updating to "local" side of the conflict: e800202333a4
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	187	merging "other" content-divergent changeset 'ae3429430ef1'
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	188	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
4584 fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	189	other divergent changeset ae3429430ef1 has same content as local e800202333a4 and differs by "description" only, discarding ae3429430ef1
4583 4fcf9a71befc evolve: show a status message when merging leads to public cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4582 diff changeset	190	content divergence resolution between e800202333a4 (public) and ae3429430ef1 has same content as e800202333a4, discarding ae3429430ef1
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	191
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	192	$ hg evolve -l
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	193
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	194	$ hg par
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	195	changeset: 5:e800202333a4
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	196	tag: tip
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	197	parent: 2:155349b645be
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	198	user: test
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	199	date: Thu Jan 01 00:00:00 1970 +0000
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	200	summary: added d
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	201
4530 d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	202	$ 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	203
4530 d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	204	Testing when same parent, merging conflict:
d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	205	-------------------------------------------
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	206
4530 d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	207	$ hg init pubdiv3
d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	208	$ cd pubdiv3
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	209	$ for ch in a b c; do
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	210	> echo $ch > $ch;
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	211	> hg ci -Am "added "$ch;
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	212	> done;
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	213	adding a
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	214	adding b
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	215	adding c
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	216
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	217	$ hg up .^
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	218	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	219	$ echo chconflict > ch
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	220	$ hg add ch
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	221	$ hg ci -m "added ch"
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	222	created new head
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	223
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	224	$ hg up .^
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	225	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	226	$ echo ch > ch
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	227	$ hg add ch
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	228	$ hg ci -m "added c"
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	229	created new head
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	230
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	231	$ hg glog
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	232	@ 4:f7c1071f1e7c added c
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	233	\| draft
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	234	\|
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	235	\| o 3:229da2719b19 added ch
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	236	\|/ draft
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	237	\|
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	238	\| o 2:155349b645be added c
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	239	\|/ draft
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	240	\|
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	241	o 1:5f6d8a4bf34a added b
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	242	\| draft
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	243	\|
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	244	o 0:9092f1db7931 added a
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	245	draft
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	246
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	247
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	248	$ hg prune 2 -s 3
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	249	1 changesets pruned
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	250	$ hg prune 2 -s 4 --hidden
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	251	1 changesets pruned
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	252	2 new content-divergent changesets
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	253	$ hg phase --public -r 4
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	254
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	255	$ hg glog
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	256	@ 4:f7c1071f1e7c added c
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	257	\| public
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	258	\|
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	259	\| * 3:229da2719b19 added ch
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	260	\|/ draft content-divergent
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	261	\|
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	262	o 1:5f6d8a4bf34a added b
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	263	\| public
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	264	\|
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	265	o 0:9092f1db7931 added a
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	266	public
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	267
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	268	$ hg evolve --content-divergent --any
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	269	merge:[4] added c
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	270	with: [3] added ch
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	271	base: [2] added c
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	272	merging "other" content-divergent changeset '229da2719b19'
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	273	merging ch
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	274	warning: conflicts while merging ch! (edit, then use 'hg resolve --mark')
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	275	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	276	fix conflicts and see `hg help evolve.interrupted`
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	277	[1]
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	278
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	279	$ hg diff
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	280	diff -r f7c1071f1e7c ch
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	281	--- a/ch Thu Jan 01 00:00:00 1970 +0000
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	282	+++ b/ch Thu Jan 01 00:00:00 1970 +0000
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	283	@@ -1,1 +1,5 @@
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	284	+<<<<<<< local: f7c1071f1e7c - test: added c
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	285	ch
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	286	+=======
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	287	+chconflict
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	288	+>>>>>>> other: 229da2719b19 - test: added ch
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	289
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	290	$ echo ch > ch
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	291	$ hg res -m
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	292	(no more unresolved files)
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	293	continue: hg evolve --continue
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	294
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	295	$ hg evolve --continue
4584 fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	296	other divergent changeset 229da2719b19 has same content as local f7c1071f1e7c and differs by "description" only, discarding 229da2719b19
4417 b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	297	working directory is now at f7c1071f1e7c
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	298
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	299	$ hg evolve -l
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	300
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	301	$ hg par
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	302	changeset: 4:f7c1071f1e7c
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	303	tag: tip
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	304	parent: 1:5f6d8a4bf34a
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	305	user: test
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	306	date: Thu Jan 01 00:00:00 1970 +0000
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	307	summary: added c
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	308
4530 d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	309	$ cd ..
4417 b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	310
4530 d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	311	Testing when different parent, relocation conflict:
d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	312	---------------------------------------------------
d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	313
d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	314	$ hg init pubdiv4
d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	315	$ cd pubdiv4
4417 b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	316	$ for ch in a b c d; do
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	317	> echo $ch > $ch;
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	318	> hg ci -Am "added "$ch;
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	319	> done;
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	320	adding a
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	321	adding b
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	322	adding c
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	323	adding d
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	324
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	325	$ hg up 1
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	326	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	327	$ echo dh > dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	328	$ echo cc > c
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	329	$ hg add dh c
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	330	$ hg ci -m "added dh"
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	331	created new head
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	332
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	333	$ hg up 2
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	334	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	335	$ echo dh > dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	336	$ hg add dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	337	$ hg ci -m "added d"
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	338	created new head
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	339
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	340	$ hg glog
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	341	@ 5:e800202333a4 added d
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	342	\| draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	343	\|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	344	\| o 4:f89a8e2f86ac added dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	345	\| \| draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	346	\| \|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	347	+---o 3:9150fe93bec6 added d
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	348	\| \| draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	349	\| \|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	350	o \| 2:155349b645be added c
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	351	\|/ draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	352	\|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	353	o 1:5f6d8a4bf34a added b
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	354	\| draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	355	\|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	356	o 0:9092f1db7931 added a
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	357	draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	358
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	359
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	360	$ hg prune 3 -s 4
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	361	1 changesets pruned
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	362	$ hg prune 3 -s 5 --hidden
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	363	1 changesets pruned
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	364	2 new content-divergent changesets
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	365	$ hg phase --public -r 5
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	366
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	367	$ hg glog
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	368	@ 5:e800202333a4 added d
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	369	\| public
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	370	\|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	371	\| * 4:f89a8e2f86ac added dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	372	\| \| draft content-divergent
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	373	\| \|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	374	o \| 2:155349b645be added c
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	375	\|/ public
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	376	\|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	377	o 1:5f6d8a4bf34a added b
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	378	\| public
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	379	\|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	380	o 0:9092f1db7931 added a
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	381	public
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	382
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	383	$ hg evolve --content-divergent --any
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	384	merge:[5] added d
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	385	with: [4] added dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	386	base: [3] added d
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	387	rebasing "other" content-divergent changeset f89a8e2f86ac on 155349b645be
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	388	merging c
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	389	warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	390	fix conflicts and see `hg help evolve.interrupted`
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	391	[1]
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	392
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	393	$ echo c > c
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	394	$ hg res -m
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	395	(no more unresolved files)
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	396	continue: hg evolve --continue
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	397
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	398	$ hg evolve --continue
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	399	evolving 4:f89a8e2f86ac "added dh"
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	400	updating to "local" side of the conflict: e800202333a4
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	401	merging "other" content-divergent changeset 'bc309da55b88'
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	402	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
4584 fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	403	other divergent changeset bc309da55b88 has same content as local e800202333a4 and differs by "description" only, discarding bc309da55b88
4417 b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	404	working directory is now at e800202333a4
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	405
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	406	$ hg evolve -l
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	407
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	408	$ hg par
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	409	changeset: 5:e800202333a4
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	410	tag: tip
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	411	parent: 2:155349b645be
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	412	user: test
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4413 diff changeset	413	date: Thu Jan 01 00:00:00 1970 +0000
4417 b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	414	summary: added d
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	415
4530 d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	416	$ cd ..
4417 b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	417
4530 d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	418	Testing when different parent, merging conflict:
d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	419	------------------------------------------------
d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	420
d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	421	$ hg init pubdiv5
d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	422	$ cd pubdiv5
4417 b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	423	$ for ch in a b c d; do
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	424	> echo $ch > $ch;
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	425	> hg ci -Am "added "$ch;
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	426	> done;
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	427	adding a
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	428	adding b
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	429	adding c
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	430	adding d
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	431
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	432	$ hg up 1
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	433	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	434	$ echo dhconflict > dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	435	$ hg add dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	436	$ hg ci -m "added dh"
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	437	created new head
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	438
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	439	$ hg up 2
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	440	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	441	$ echo dh > dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	442	$ hg add dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	443	$ hg ci -m "added d"
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	444	created new head
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	445
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	446	$ hg glog
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	447	@ 5:e800202333a4 added d
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	448	\| draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	449	\|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	450	\| o 4:db0b7bba0aae added dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	451	\| \| draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	452	\| \|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	453	+---o 3:9150fe93bec6 added d
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	454	\| \| draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	455	\| \|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	456	o \| 2:155349b645be added c
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	457	\|/ draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	458	\|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	459	o 1:5f6d8a4bf34a added b
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	460	\| draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	461	\|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	462	o 0:9092f1db7931 added a
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	463	draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	464
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	465
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	466	$ hg prune 3 -s 4
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	467	1 changesets pruned
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	468	$ hg prune 3 -s 5 --hidden
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	469	1 changesets pruned
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	470	2 new content-divergent changesets
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	471	$ hg phase --public -r 5
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	472
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	473	$ hg glog
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	474	@ 5:e800202333a4 added d
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	475	\| public
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	476	\|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	477	\| * 4:db0b7bba0aae added dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	478	\| \| draft content-divergent
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	479	\| \|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	480	o \| 2:155349b645be added c
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	481	\|/ public
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	482	\|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	483	o 1:5f6d8a4bf34a added b
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	484	\| public
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	485	\|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	486	o 0:9092f1db7931 added a
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	487	public
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	488
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	489	$ hg evolve --content-divergent --any
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	490	merge:[5] added d
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	491	with: [4] added dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	492	base: [3] added d
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	493	rebasing "other" content-divergent changeset db0b7bba0aae on 155349b645be
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	494	updating to "local" side of the conflict: e800202333a4
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	495	merging "other" content-divergent changeset 'a5bbf2042450'
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	496	merging dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	497	warning: conflicts while merging dh! (edit, then use 'hg resolve --mark')
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	498	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	499	fix conflicts and see `hg help evolve.interrupted`
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	500	[1]
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	501
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	502	$ echo dh > dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	503	$ hg res -m
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	504	(no more unresolved files)
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	505	continue: hg evolve --continue
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	506
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	507	$ hg evolve --continue
4584 fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	508	other divergent changeset a5bbf2042450 has same content as local e800202333a4 and differs by "description" only, discarding a5bbf2042450
4417 b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	509	working directory is now at e800202333a4
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	510
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	511	$ hg evolve -l
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	512
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	513	$ hg par
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	514	changeset: 5:e800202333a4
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	515	tag: tip
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	516	parent: 2:155349b645be
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	517	user: test
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	518	date: Thu Jan 01 00:00:00 1970 +0000
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	519	summary: added d
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	520
4530 d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	521	$ cd ..
4417 b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	522
4530 d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	523	Testing when different parent, conflict in relocation and merging:
d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	524	------------------------------------------------------------------
4417 b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	525
4530 d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	526	$ hg init pubdiv6
d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	527	$ cd pubdiv6
4417 b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	528	$ for ch in a b c d; do
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	529	> echo $ch > $ch;
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	530	> hg ci -Am "added "$ch;
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	531	> done;
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	532	adding a
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	533	adding b
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	534	adding c
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	535	adding d
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	536
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	537	$ hg up 1
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	538	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	539	$ echo dhconflict > dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	540	$ echo cc > c
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	541	$ hg add dh c
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	542	$ hg ci -m "added dh"
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	543	created new head
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	544
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	545	$ hg up 2
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	546	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	547	$ echo dh > dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	548	$ hg add dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	549	$ hg ci -m "added d"
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	550	created new head
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	551
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	552	$ hg glog
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	553	@ 5:e800202333a4 added d
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	554	\| draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	555	\|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	556	\| o 4:67b19bbd770f added dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	557	\| \| draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	558	\| \|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	559	+---o 3:9150fe93bec6 added d
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	560	\| \| draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	561	\| \|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	562	o \| 2:155349b645be added c
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	563	\|/ draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	564	\|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	565	o 1:5f6d8a4bf34a added b
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	566	\| draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	567	\|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	568	o 0:9092f1db7931 added a
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	569	draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	570
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	571
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	572	$ hg prune 3 -s 4
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	573	1 changesets pruned
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	574	$ hg prune 3 -s 5 --hidden
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	575	1 changesets pruned
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	576	2 new content-divergent changesets
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	577	$ hg phase --public -r 5
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	578
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	579	$ hg glog
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	580	@ 5:e800202333a4 added d
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	581	\| public
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	582	\|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	583	\| * 4:67b19bbd770f added dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	584	\| \| draft content-divergent
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	585	\| \|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	586	o \| 2:155349b645be added c
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	587	\|/ public
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	588	\|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	589	o 1:5f6d8a4bf34a added b
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	590	\| public
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	591	\|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	592	o 0:9092f1db7931 added a
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	593	public
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	594
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	595	$ hg evolve --content-divergent --any
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	596	merge:[5] added d
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	597	with: [4] added dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	598	base: [3] added d
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	599	rebasing "other" content-divergent changeset 67b19bbd770f on 155349b645be
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	600	merging c
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	601	warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	602	fix conflicts and see `hg help evolve.interrupted`
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	603	[1]
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	604
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	605	$ echo c > c
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	606	$ hg res -m
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	607	(no more unresolved files)
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	608	continue: hg evolve --continue
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	609
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	610	$ hg evolve --continue
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	611	evolving 4:67b19bbd770f "added dh"
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	612	updating to "local" side of the conflict: e800202333a4
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	613	merging "other" content-divergent changeset '09054d1f3c97'
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	614	merging dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	615	warning: conflicts while merging dh! (edit, then use 'hg resolve --mark')
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	616	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	617	fix conflicts and see `hg help evolve.interrupted`
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	618	[1]
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	619
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	620	$ echo dh > dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	621	$ hg res -m
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	622	(no more unresolved files)
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	623	continue: hg evolve --continue
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	624
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	625	$ hg evolve --continue
4584 fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	626	other divergent changeset 09054d1f3c97 has same content as local e800202333a4 and differs by "description" only, discarding 09054d1f3c97
4417 b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	627	working directory is now at e800202333a4
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	628
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	629	$ hg evolve -l
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	630
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	631	$ hg par
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	632	changeset: 5:e800202333a4
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	633	tag: tip
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	634	parent: 2:155349b645be
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	635	user: test
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	636	date: Thu Jan 01 00:00:00 1970 +0000
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	637	summary: added d
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	638
4444 ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	639	$ cd ..
4584 fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	640
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	641	Testing that we warn the user for the metadata being lost in divergence resolution:
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	642	-----------------------------------------------------------------------------------
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	643
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	644	$ hg init pubdiv7
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	645	$ cd pubdiv7
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	646	$ for ch in a b c d; do
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	647	> echo $ch > $ch;
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	648	> hg ci -Am "added "$ch;
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	649	> done;
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	650	adding a
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	651	adding b
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	652	adding c
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	653	adding d
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	654
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	655	$ echo dada > d
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	656	$ hg amend
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	657	$ hg up -r "desc('added c')"
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	658	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	659	$ hg branch feature
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	660	marked working directory as branch feature
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	661	(branches are permanent and global, did you want a bookmark?)
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	662	$ echo dada > d
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	663	$ hg ci -Am "added d"
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	664	adding d
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	665	$ hg prune -r "min(desc('added d'))" -s . --hidden
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	666	1 changesets pruned
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	667	2 new content-divergent changesets
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	668
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	669	(publish one side)
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	670	$ hg phase --public
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	671	$ hg up -r "draft()"
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	672	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	673
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	674	(make other divergent a closed branch head)
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	675	$ hg ci --amend -m "closing feature branch" --close-branch
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	676
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	677	$ hg glog
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	678	@ 6:af442315d198 closing feature branch
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	679	\| draft content-divergent
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	680	\|
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	681	\| o 5:497d0d2b90ba added d
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	682	\|/ public
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	683	\|
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	684	o 2:155349b645be added c
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	685	\| public
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	686	\|
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	687	o 1:5f6d8a4bf34a added b
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	688	\| public
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	689	\|
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	690	o 0:9092f1db7931 added a
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	691	public
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	692
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	693
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	694	Run automatic evolution:
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	695
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	696	$ hg evolve --content-divergent
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	697	merge:[5] added d
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	698	with: [6] closing feature branch
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	699	base: [3] added d
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	700	updating to "local" side of the conflict: 497d0d2b90ba
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	701	merging "other" content-divergent changeset 'af442315d198'
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	702	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	703	other divergent changeset af442315d198 is a closed branch head and differs from local 497d0d2b90ba by "branch, description" only, discarding af442315d198
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	704	content divergence resolution between 497d0d2b90ba (public) and af442315d198 has same content as 497d0d2b90ba, discarding af442315d198
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	705	working directory is now at 497d0d2b90ba
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	706

author	Matt Harbison <matt_harbison@yahoo.com>
	Sat, 27 Apr 2019 22:45:16 -0400
changeset 4625	a4fde4e3e763
parent 4584	fd8dada76730
child 4633	61c2518cd6d2
permissions	-rw-r--r--