evolve: tests/test-evolve-public-content-divergent-discard.t@583dc6ef3eb2 (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
5079 1f92a6aa40d6 evolve: add pre-check logic for content-divergence in rewriteutil.precheck() Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4676 diff changeset	20	> [experimental]
1f92a6aa40d6 evolve: add pre-check logic for content-divergence in rewriteutil.precheck() Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4676 diff changeset	21	> evolution.allowdivergence = True
4383 3343eac099ec evolve: add logic to resolve content-divergence with a public cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: diff changeset	22	> [extensions]
3343eac099ec evolve: add logic to resolve content-divergence with a public cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: diff changeset	23	> rebase =
3343eac099ec evolve: add logic to resolve content-divergence with a public cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: diff changeset	24	> EOF
3343eac099ec evolve: add logic to resolve content-divergence with a public cset Sushil khanchi <sushilkhanchi97@gmail.com> parents: diff changeset	25	$ 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	26
4530 d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	27	Testing when same parent, no conflict:
d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	28	--------------------------------------
4384 8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4383 diff changeset	29
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4383 diff changeset	30	$ hg init pubdiv1
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4383 diff changeset	31	$ 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	32	$ 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	33	> 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	34	> 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	35	> 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	36	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	37	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	38	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	39
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	$ 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	41	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	42	$ 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	43	$ 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	44	$ 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	45	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	46
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	$ 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	48	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	49	$ 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	50	$ 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	51	$ 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	52	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	53
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	$ 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	55	@ 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	56	\| 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	57	\|
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	\| 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	59	\|/ 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	60	\|
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	\| 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	62	\|/ 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	63	\|
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	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	65	\| 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	66	\|
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	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	68	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	69
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
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 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	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	$ 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	74	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	75	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	76	$ 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	77
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	$ 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	79	@ 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	80	\| 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	81	\|
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	\| * 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	83	\|/ 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	84	\|
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	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	86	\| 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	87	\|
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	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	89	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	90
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	$ 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	92	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	93	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	94	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	95	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	96	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	97	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	98
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	$ 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	100
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	$ 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	102	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	103	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	104	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	105	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	106	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	107	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	108
4530 d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	109	$ 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	110
4530 d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	111	Testing when different parent, no conflict:
d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	112	-------------------------------------------
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	113
4530 d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	114	$ hg init pubdiv2
d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	115	$ 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	116	$ 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	117	> 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	118	> 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	119	> 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	120	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	121	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	122	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	123	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	124
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	$ 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	126	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	127	$ 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	128	$ 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	129	$ 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	130	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	131
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	$ 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	133	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	134	$ 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	135	$ 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	136	$ 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	137	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	138
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	$ 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	140	@ 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	141	\| 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	142	\|
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	\| 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	144	\| \| 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	145	\| \|
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	+---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	147	\| \| 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	148	\| \|
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	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	150	\|/ 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	151	\|
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	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	153	\| 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	154	\|
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	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	156	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	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
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	$ 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	160	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	161	$ 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	162	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	163	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	164	$ 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	165
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	$ 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	167	@ 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	168	\| 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	169	\|
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	\| * 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	171	\| \| 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	172	\| \|
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	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	174	\|/ 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	175	\|
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	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	177	\| 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	178	\|
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	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	180	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	181
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	$ 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	183	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	184	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	185	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	186	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	187	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	188	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	189	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	190
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	$ 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	192
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	$ 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	194	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	195	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	196	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	197	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	198	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	199	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	200
4530 d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	201	$ 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	202
4530 d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	203	Testing when same parent, merging conflict:
d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	204	-------------------------------------------
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	205
4530 d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	206	$ hg init pubdiv3
d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	207	$ 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	208	$ 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	209	> 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	210	> 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	211	> 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	212	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	213	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	214	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	215
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	$ 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	217	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	218	$ 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	219	$ 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	220	$ 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	221	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	222
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	$ 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	224	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	225	$ 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	226	$ 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	227	$ 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	228	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	229
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	$ 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	231	@ 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	232	\| 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	233	\|
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	\| 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	235	\|/ 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	236	\|
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	\| 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	238	\|/ 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	239	\|
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	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	241	\| 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	242	\|
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	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	244	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	245
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	$ 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	248	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	249	$ 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	250	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	251	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	252	$ 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	253
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	$ 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	255	@ 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	256	\| 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	257	\|
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	\| * 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	259	\|/ 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	260	\|
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	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	262	\| 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	263	\|
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	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	265	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	266
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	$ 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	268	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	269	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	270	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	271	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	272	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	273	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
4676 b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them Anton Shestakov <av6@dwimlabs.net> parents: 4660 diff changeset	274	unresolved merge conflicts
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them Anton Shestakov <av6@dwimlabs.net> parents: 4660 diff changeset	275	(see 'hg help evolve.interrupted')
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	276	[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	277
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	$ 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	279	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	280	--- 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	281	+++ 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	282	@@ -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	283	+<<<<<<< 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	284	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	285	+=======
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	+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	287	+>>>>>>> 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	288
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	$ 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	290	$ 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	291	(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	292	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	293
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	$ 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	295	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	296	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	297
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	$ 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	299
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	$ 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	301	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	302	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	303	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	304	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	305	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	306	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	307
4530 d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	308	$ 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	309
4530 d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	310	Testing when different parent, relocation conflict:
d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	311	---------------------------------------------------
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	$ hg init pubdiv4
d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	314	$ 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	315	$ 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	316	> 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	317	> 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	318	> done;
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	319	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	320	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	321	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	322	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	323
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	324	$ 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	325	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	326	$ 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	327	$ 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	328	$ 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	329	$ 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	330	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	331
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	332	$ 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	333	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	334	$ 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	335	$ 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	336	$ 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	337	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	338
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	339	$ 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	340	@ 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	341	\| draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	342	\|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	343	\| 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	344	\| \| draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	345	\| \|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	346	+---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	347	\| \| draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	348	\| \|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	349	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	350	\|/ draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	351	\|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	352	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	353	\| draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	354	\|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	355	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	356	draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	357
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	$ 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	360	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	361	$ 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	362	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	363	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	364	$ 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	365
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	366	$ 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	367	@ 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	368	\| public
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	369	\|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	370	\| * 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	371	\| \| 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	372	\| \|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	373	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	374	\|/ public
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	375	\|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	376	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	377	\| public
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	378	\|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	379	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	380	public
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	381
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	382	$ 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	383	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	384	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	385	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	386	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	387	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	388	warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
4676 b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them Anton Shestakov <av6@dwimlabs.net> parents: 4660 diff changeset	389	unresolved merge conflicts
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them Anton Shestakov <av6@dwimlabs.net> parents: 4660 diff changeset	390	(see 'hg help evolve.interrupted')
4417 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	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	401	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	402	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	403
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	404	$ 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	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 par
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	407	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	408	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	409	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	410	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	411	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	412	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	413
4530 d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	414	$ 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	415
4530 d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	416	Testing when different parent, merging conflict:
d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	417	------------------------------------------------
d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	418
d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	419	$ hg init pubdiv5
d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	420	$ 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	421	$ 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	422	> 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	423	> 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	424	> done;
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	425	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	426	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	427	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	428	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	429
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	430	$ 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	431	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	432	$ 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	433	$ 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	434	$ 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	435	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	436
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	437	$ 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	438	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	439	$ 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	440	$ 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	441	$ 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	442	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	443
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	444	$ 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	445	@ 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	446	\| draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	447	\|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	448	\| 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	449	\| \| draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	450	\| \|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	451	+---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	452	\| \| draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	453	\| \|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	454	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	455	\|/ draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	456	\|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	457	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	458	\| draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	459	\|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	460	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	461	draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	462
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	463
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	464	$ 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	465	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	466	$ 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	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	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	469	$ 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	470
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 glog
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	472	@ 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	473	\| public
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	474	\|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	475	\| * 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	476	\| \| 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	477	\| \|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	478	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	479	\|/ public
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	480	\|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	481	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	482	\| public
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	483	\|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	484	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	485	public
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	486
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	487	$ 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	488	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	489	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	490	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	491	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	492	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	493	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	494	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
4676 b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them Anton Shestakov <av6@dwimlabs.net> parents: 4660 diff changeset	495	unresolved merge conflicts
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them Anton Shestakov <av6@dwimlabs.net> parents: 4660 diff changeset	496	(see 'hg help evolve.interrupted')
4417 b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	497	[1]
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	498
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	499	$ 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	500	$ 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	501	(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	502	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	503
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	504	$ 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	505	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	506	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	507
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	508	$ 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	509
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	510	$ 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	511	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	512	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	513	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	514	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	515	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	516	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	517
4530 d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	518	$ 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	519
4530 d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	520	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	521	------------------------------------------------------------------
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	$ hg init pubdiv6
d081cc4f5fef tests: consolidate the public-content-divergent test cases Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4473 diff changeset	524	$ 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	525	$ 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	526	> 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	527	> 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	528	> done;
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	529	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	530	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	531	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	532	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	533
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	534	$ 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	535	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	536	$ 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	537	$ 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	538	$ 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	539	$ 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	540	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	541
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 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	543	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	544	$ 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	545	$ 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	546	$ 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	547	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	548
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 glog
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	550	@ 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	551	\| draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	552	\|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	553	\| 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	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 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	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 \| 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	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 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	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 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	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
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	569	$ 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	570	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	571	$ 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	572	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	573	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	574	$ 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	575
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	576	$ 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	577	@ 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	578	\| public
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	579	\|
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	580	\| * 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	581	\| \| 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	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	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	584	\|/ public
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 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	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 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	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	$ 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	593	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	594	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	595	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	596	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	597	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	598	warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
4676 b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them Anton Shestakov <av6@dwimlabs.net> parents: 4660 diff changeset	599	unresolved merge conflicts
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them Anton Shestakov <av6@dwimlabs.net> parents: 4660 diff changeset	600	(see 'hg help evolve.interrupted')
4417 b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	601	[1]
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	602
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	603	$ 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	604	$ 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	605	(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	606	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	607
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	608	$ 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	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	610	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	611	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	612	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
4676 b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them Anton Shestakov <av6@dwimlabs.net> parents: 4660 diff changeset	613	unresolved merge conflicts
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them Anton Shestakov <av6@dwimlabs.net> parents: 4660 diff changeset	614	(see 'hg help evolve.interrupted')
4417 b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	615	[1]
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	616
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	617	$ 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	618	$ 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	619	(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	620	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	621
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	622	$ 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	623	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	624	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	625
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	626	$ 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	627
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4416 diff changeset	628	$ 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	629	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	630	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	631	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	632	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	633	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	634	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	635
4444 ea336a6592cc evolve: test a common case of public divergence Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4438 diff changeset	636	$ cd ..
4584 fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	637
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	638	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	639	-----------------------------------------------------------------------------------
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	$ 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	642	$ cd pubdiv7
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	643	$ 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	644	> 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	645	> 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	646	> done;
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	647	adding a
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	648	adding b
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	649	adding c
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	650	adding d
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	651
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	652	$ 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	653	$ hg amend
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	654	$ 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	655	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	656	$ 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	657	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	658	(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	659	$ 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	660	$ 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	661	adding d
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	662	$ 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	663	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	664	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	665
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	666	(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	667	$ 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	668	$ 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	669	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	670
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	671	(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	672	$ 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	673
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	674	$ hg glog
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	675	@ 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	676	\| 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	677	\|
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	678	\| 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	679	\|/ public
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 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	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 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	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 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	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
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	691	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	692
fd8dada76730 evolve: warn user for the metadata being lost in public divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4583 diff changeset	693	$ 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	694	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	695	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	696	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	697	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	698	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	699	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	700	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	701

author	Anton Shestakov <av6@dwimlabs.net>
	Wed, 04 Mar 2020 16:53:48 +0100
branch	stable
changeset 5152	583dc6ef3eb2
parent 5079	1f92a6aa40d6
permissions	-rw-r--r--