evolve: tests/test-evolve-content-divergent-relocation.t@844b1ad5b34b (annotated)

4481 d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4424 diff changeset	1	======================================================
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4424 diff changeset	2	Tests the resolution of content divergence: relocation
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4424 diff changeset	3	======================================================
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4424 diff changeset	4
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4424 diff changeset	5	This file intend to cover case where changesets need to be moved to different parents
3790 5b9e3aaa6da8 evolve: prompt user for branch selection while resolving content-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	6
5b9e3aaa6da8 evolve: prompt user for branch selection while resolving content-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	7	$ cat >> $HGRCPATH <<EOF
5b9e3aaa6da8 evolve: prompt user for branch selection while resolving content-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	8	> [alias]
5b9e3aaa6da8 evolve: prompt user for branch selection while resolving content-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	9	> glog = log -GT "{rev}:{node\|short} {desc\|firstline}\n ({bookmarks}) [{branch}] {phase}"
3844 48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	10	> [phases]
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	11	> publish = False
3790 5b9e3aaa6da8 evolve: prompt user for branch selection while resolving content-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	12	> [extensions]
3804 509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	13	> rebase =
3790 5b9e3aaa6da8 evolve: prompt user for branch selection while resolving content-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	14	> EOF
5b9e3aaa6da8 evolve: prompt user for branch selection while resolving content-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	15	$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
5b9e3aaa6da8 evolve: prompt user for branch selection while resolving content-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	16
3804 509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	17	Testing resolution of content-divergent changesets when they are on different
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	18	parents and resolution and relocation wont result in conflicts
3804 509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	19	------------------------------------------------------------------------------
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	20
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	21	$ hg init multiparents
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	22	$ cd multiparents
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	23	$ echo ".*\.orig" > .hgignore
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	24	$ hg add .hgignore
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	25	$ hg ci -m "added hgignore"
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	26	$ for ch in a b c d; do echo foo > $ch; hg add $ch; hg ci -qm "added "$ch; done;
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	27
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	28	$ hg glog
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	29	@ 4:c41c793e0ef1 added d
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	30	\| () [default] draft
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	31	o 3:ca1b80f7960a added c
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	32	\| () [default] draft
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	33	o 2:b1661037fa25 added b
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	34	\| () [default] draft
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	35	o 1:c7586e2a9264 added a
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	36	\| () [default] draft
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	37	o 0:8fa14d15e168 added hgignore
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	38	() [default] draft
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	39
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	40	$ hg up .^^
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	41	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	42	$ echo bar > b
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	43	$ hg amend
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	44	2 new orphan changesets
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	45
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	46	$ hg rebase -r b1661037fa25 -d 8fa14d15e168 --hidden --config experimental.evolution.allowdivergence=True
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	47	rebasing 2:b1661037fa25 "added b"
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	48	2 new content-divergent changesets
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	49
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	50	$ hg glog
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	51	* 6:da4b96f4a8d6 added b
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	52	\| () [default] draft
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	53	\| @ 5:7ed0642d644b added b
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	54	\| \| () [default] draft
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	55	\| \| * 4:c41c793e0ef1 added d
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	56	\| \| \| () [default] draft
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	57	\| \| * 3:ca1b80f7960a added c
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	58	\| \| \| () [default] draft
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	59	\| \| x 2:b1661037fa25 added b
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	60	\| \|/ () [default] draft
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	61	\| o 1:c7586e2a9264 added a
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	62	\|/ () [default] draft
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	63	o 0:8fa14d15e168 added hgignore
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	64	() [default] draft
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	65
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	66	$ hg evolve --content-divergent
3805 2410e7063692 evolve: implement resolution of content-divergence when on differet parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3804 diff changeset	67	merge:[5] added b
2410e7063692 evolve: implement resolution of content-divergence when on differet parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3804 diff changeset	68	with: [6] added b
2410e7063692 evolve: implement resolution of content-divergence when on differet parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3804 diff changeset	69	base: [2] added b
2410e7063692 evolve: implement resolution of content-divergence when on differet parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3804 diff changeset	70	rebasing "other" content-divergent changeset da4b96f4a8d6 on c7586e2a9264
2410e7063692 evolve: implement resolution of content-divergence when on differet parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3804 diff changeset	71	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	72	working directory is now at e7fdc662d630
3804 509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	73
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	74	$ hg glog
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	75	@ 8:e7fdc662d630 added b
3804 509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	76	\| () [default] draft
3805 2410e7063692 evolve: implement resolution of content-divergence when on differet parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3804 diff changeset	77	\| * 4:c41c793e0ef1 added d
3804 509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	78	\| \| () [default] draft
3805 2410e7063692 evolve: implement resolution of content-divergence when on differet parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3804 diff changeset	79	\| * 3:ca1b80f7960a added c
2410e7063692 evolve: implement resolution of content-divergence when on differet parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3804 diff changeset	80	\| \| () [default] draft
2410e7063692 evolve: implement resolution of content-divergence when on differet parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3804 diff changeset	81	\| x 2:b1661037fa25 added b
3804 509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	82	\|/ () [default] draft
3805 2410e7063692 evolve: implement resolution of content-divergence when on differet parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3804 diff changeset	83	o 1:c7586e2a9264 added a
2410e7063692 evolve: implement resolution of content-divergence when on differet parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3804 diff changeset	84	\| () [default] draft
3804 509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	85	o 0:8fa14d15e168 added hgignore
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	86	() [default] draft
3805 2410e7063692 evolve: implement resolution of content-divergence when on differet parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3804 diff changeset	87
2410e7063692 evolve: implement resolution of content-divergence when on differet parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3804 diff changeset	88	$ hg exp
2410e7063692 evolve: implement resolution of content-divergence when on differet parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3804 diff changeset	89	# HG changeset patch
2410e7063692 evolve: implement resolution of content-divergence when on differet parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3804 diff changeset	90	# User test
2410e7063692 evolve: implement resolution of content-divergence when on differet parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3804 diff changeset	91	# Date 0 0
2410e7063692 evolve: implement resolution of content-divergence when on differet parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3804 diff changeset	92	# Thu Jan 01 00:00:00 1970 +0000
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	93	# Node ID e7fdc662d6305fee2908c3f1630e0b20d6f4689a
3805 2410e7063692 evolve: implement resolution of content-divergence when on differet parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3804 diff changeset	94	# Parent c7586e2a92645e473645847a7b69a6dc52be4276
2410e7063692 evolve: implement resolution of content-divergence when on differet parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3804 diff changeset	95	added b
2410e7063692 evolve: implement resolution of content-divergence when on differet parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3804 diff changeset	96
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	97	diff -r c7586e2a9264 -r e7fdc662d630 b
3805 2410e7063692 evolve: implement resolution of content-divergence when on differet parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3804 diff changeset	98	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
2410e7063692 evolve: implement resolution of content-divergence when on differet parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3804 diff changeset	99	+++ b/b Thu Jan 01 00:00:00 1970 +0000
2410e7063692 evolve: implement resolution of content-divergence when on differet parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3804 diff changeset	100	@@ -0,0 +1,1 @@
2410e7063692 evolve: implement resolution of content-divergence when on differet parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3804 diff changeset	101	+bar
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	102
5324 c834fdb87f90 tests: add more verification of output to divergence tests Martin von Zweigbergk <martinvonz@google.com> parents: 5323 diff changeset	103	$ hg debugobsolete
c834fdb87f90 tests: add more verification of output to divergence tests Martin von Zweigbergk <martinvonz@google.com> parents: 5323 diff changeset	104	b1661037fa25511d0b7ccddf405e336f9d7d3424 7ed0642d644bb9ad93d252dd9ffe7b4729febe48 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
c834fdb87f90 tests: add more verification of output to divergence tests Martin von Zweigbergk <martinvonz@google.com> parents: 5323 diff changeset	105	b1661037fa25511d0b7ccddf405e336f9d7d3424 da4b96f4a8d610a85b225583138f681d67e275dd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
c834fdb87f90 tests: add more verification of output to divergence tests Martin von Zweigbergk <martinvonz@google.com> parents: 5323 diff changeset	106	da4b96f4a8d610a85b225583138f681d67e275dd 11f849d7159fa30a63dbbc1a6d251a8d996baeb5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	107	7ed0642d644bb9ad93d252dd9ffe7b4729febe48 e7fdc662d6305fee2908c3f1630e0b20d6f4689a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	108	11f849d7159fa30a63dbbc1a6d251a8d996baeb5 e7fdc662d6305fee2908c3f1630e0b20d6f4689a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
5324 c834fdb87f90 tests: add more verification of output to divergence tests Martin von Zweigbergk <martinvonz@google.com> parents: 5323 diff changeset	109	$ hg obslog --all
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	110	@ e7fdc662d630 (8) added b
5349 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5345 diff changeset	111	\|\ amended(content) from 11f849d7159f using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5345 diff changeset	112	\| \| rewritten from 7ed0642d644b using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5345 diff changeset	113	\| \|
5324 c834fdb87f90 tests: add more verification of output to divergence tests Martin von Zweigbergk <martinvonz@google.com> parents: 5323 diff changeset	114	x \| 11f849d7159f (7) added b
5349 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5345 diff changeset	115	\| \| rebased(parent) from da4b96f4a8d6 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
5324 c834fdb87f90 tests: add more verification of output to divergence tests Martin von Zweigbergk <martinvonz@google.com> parents: 5323 diff changeset	116	\| \|
c834fdb87f90 tests: add more verification of output to divergence tests Martin von Zweigbergk <martinvonz@google.com> parents: 5323 diff changeset	117	\| x 7ed0642d644b (5) added b
5349 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5345 diff changeset	118	\| \| amended(content) from b1661037fa25 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
5324 c834fdb87f90 tests: add more verification of output to divergence tests Martin von Zweigbergk <martinvonz@google.com> parents: 5323 diff changeset	119	\| \|
c834fdb87f90 tests: add more verification of output to divergence tests Martin von Zweigbergk <martinvonz@google.com> parents: 5323 diff changeset	120	x \| da4b96f4a8d6 (6) added b
5349 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5345 diff changeset	121	\|/ rebased(parent) from b1661037fa25 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
5324 c834fdb87f90 tests: add more verification of output to divergence tests Martin von Zweigbergk <martinvonz@google.com> parents: 5323 diff changeset	122	\|
c834fdb87f90 tests: add more verification of output to divergence tests Martin von Zweigbergk <martinvonz@google.com> parents: 5323 diff changeset	123	x b1661037fa25 (2) added b
c834fdb87f90 tests: add more verification of output to divergence tests Martin von Zweigbergk <martinvonz@google.com> parents: 5323 diff changeset	124
c834fdb87f90 tests: add more verification of output to divergence tests Martin von Zweigbergk <martinvonz@google.com> parents: 5323 diff changeset	125
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	126	Resolving orphans to get back to a normal graph
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	127
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	128	$ hg evolve --all
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	129	move:[3] added c
3846 f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents Pulkit Goyal <7895pulkit@gmail.com> parents: 3845 diff changeset	130	atop:[8] added b
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	131	move:[4] added d
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	132	$ hg glog
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	133	o 10:be5a8b9faa8a added d
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	134	\| () [default] draft
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	135	o 9:e2ce33033e42 added c
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	136	\| () [default] draft
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	137	@ 8:e7fdc662d630 added b
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	138	\| () [default] draft
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	139	o 1:c7586e2a9264 added a
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	140	\| () [default] draft
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	141	o 0:8fa14d15e168 added hgignore
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	142	() [default] draft
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	143
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	144	More testing!
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	145
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	146	$ echo x > x
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	147	$ hg ci -Aqm "added x"
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	148	$ hg glog -r .
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	149	@ 11:801b5920c7ea added x
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	150	\| () [default] draft
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	151	~
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	152
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	153	$ echo foo > x
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	154	$ hg branch bar
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	155	marked working directory as branch bar
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	156	(branches are permanent and global, did you want a bookmark?)
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	157	$ hg amend -m "added foo to x"
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	158
5325 304de9a04172 tests: avoid referring to commits by hash in a few places Martin von Zweigbergk <martinvonz@google.com> parents: 5324 diff changeset	159	$ hg up 'predecessors(.)' --hidden
5368 844b1ad5b34b test-compat: merge mercurial-4.7 into mercurial-4.6 Anton Shestakov <av6@dwimlabs.net> parents: 5163 5367 diff changeset	160	updating to a hidden changeset 801b5920c7ea
844b1ad5b34b test-compat: merge mercurial-4.7 into mercurial-4.6 Anton Shestakov <av6@dwimlabs.net> parents: 5163 5367 diff changeset	161	(hidden revision '801b5920c7ea' was rewritten as: 5cf74a13db18)
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	162	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	163	working directory parent is obsolete! (801b5920c7ea)
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	164	(use 'hg evolve' to update to its successor: 5cf74a13db18)
5325 304de9a04172 tests: avoid referring to commits by hash in a few places Martin von Zweigbergk <martinvonz@google.com> parents: 5324 diff changeset	165	$ hg rebase -r . -d 'desc("added d")' --config experimental.evolution.allowdivergence=True
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	166	rebasing 11:801b5920c7ea "added x"
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	167	2 new content-divergent changesets
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	168
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	169	$ hg glog
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	170	@ 13:45e15d6e88f5 added x
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	171	\| () [default] draft
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	172	\| * 12:5cf74a13db18 added foo to x
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	173	\| \| () [bar] draft
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	174	o \| 10:be5a8b9faa8a added d
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	175	\| \| () [default] draft
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	176	o \| 9:e2ce33033e42 added c
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	177	\|/ () [default] draft
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	178	o 8:e7fdc662d630 added b
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	179	\| () [default] draft
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	180	o 1:c7586e2a9264 added a
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	181	\| () [default] draft
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	182	o 0:8fa14d15e168 added hgignore
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	183	() [default] draft
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	184
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	185	$ hg evolve --content-divergent
3846 f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents Pulkit Goyal <7895pulkit@gmail.com> parents: 3845 diff changeset	186	merge:[13] added x
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents Pulkit Goyal <7895pulkit@gmail.com> parents: 3845 diff changeset	187	with: [12] added foo to x
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents Pulkit Goyal <7895pulkit@gmail.com> parents: 3845 diff changeset	188	base: [11] added x
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	189	rebasing "other" content-divergent changeset 5cf74a13db18 on be5a8b9faa8a
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	190	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	191	working directory is now at 4e844ab5e814
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	192
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	193	$ hg exp
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	194	# HG changeset patch
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	195	# User test
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	196	# Date 0 0
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	197	# Thu Jan 01 00:00:00 1970 +0000
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	198	# Branch bar
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	199	# Node ID 4e844ab5e8142d26fb1f0990486379f2410b0358
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	200	# Parent be5a8b9faa8af54f115aa168a2c8564acb40c37d
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	201	added foo to x
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	202
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	203	diff -r be5a8b9faa8a -r 4e844ab5e814 x
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	204	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	205	+++ b/x Thu Jan 01 00:00:00 1970 +0000
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	206	@@ -0,0 +1,1 @@
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	207	+foo
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	208
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	209	The above `hg exp` and the following log call demonstrates that message, content
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	210	and branch change is preserved in case of relocation
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	211	$ hg glog
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	212	@ 15:4e844ab5e814 added foo to x
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	213	\| () [bar] draft
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	214	o 10:be5a8b9faa8a added d
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	215	\| () [default] draft
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	216	o 9:e2ce33033e42 added c
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	217	\| () [default] draft
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	218	o 8:e7fdc662d630 added b
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	219	\| () [default] draft
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	220	o 1:c7586e2a9264 added a
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	221	\| () [default] draft
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	222	o 0:8fa14d15e168 added hgignore
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	223	() [default] draft
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	224
5324 c834fdb87f90 tests: add more verification of output to divergence tests Martin von Zweigbergk <martinvonz@google.com> parents: 5323 diff changeset	225	$ hg debugobsolete
c834fdb87f90 tests: add more verification of output to divergence tests Martin von Zweigbergk <martinvonz@google.com> parents: 5323 diff changeset	226	b1661037fa25511d0b7ccddf405e336f9d7d3424 7ed0642d644bb9ad93d252dd9ffe7b4729febe48 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
c834fdb87f90 tests: add more verification of output to divergence tests Martin von Zweigbergk <martinvonz@google.com> parents: 5323 diff changeset	227	b1661037fa25511d0b7ccddf405e336f9d7d3424 da4b96f4a8d610a85b225583138f681d67e275dd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
c834fdb87f90 tests: add more verification of output to divergence tests Martin von Zweigbergk <martinvonz@google.com> parents: 5323 diff changeset	228	da4b96f4a8d610a85b225583138f681d67e275dd 11f849d7159fa30a63dbbc1a6d251a8d996baeb5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	229	7ed0642d644bb9ad93d252dd9ffe7b4729febe48 e7fdc662d6305fee2908c3f1630e0b20d6f4689a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	230	11f849d7159fa30a63dbbc1a6d251a8d996baeb5 e7fdc662d6305fee2908c3f1630e0b20d6f4689a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	231	ca1b80f7960aae2306287bab52b4090c59af8c29 e2ce33033e42db2e61a5f71c6dfb52a33efeaf6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	232	c41c793e0ef1ddb463e85ea9491e377d01127ba2 be5a8b9faa8af54f115aa168a2c8564acb40c37d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	233	801b5920c7ea8d4ebdbc9cfc1e79e665dea2f211 5cf74a13db180e33dc2df8cd2aa70b21252a2a64 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'amend', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	234	801b5920c7ea8d4ebdbc9cfc1e79e665dea2f211 45e15d6e88f5bd23ba360dff0c7591eca2d99f43 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	235	5cf74a13db180e33dc2df8cd2aa70b21252a2a64 911c21adca136894a2b35f0a58fae7ee94fa5e61 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	236	45e15d6e88f5bd23ba360dff0c7591eca2d99f43 4e844ab5e8142d26fb1f0990486379f2410b0358 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'evolve', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	237	911c21adca136894a2b35f0a58fae7ee94fa5e61 4e844ab5e8142d26fb1f0990486379f2410b0358 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
5324 c834fdb87f90 tests: add more verification of output to divergence tests Martin von Zweigbergk <martinvonz@google.com> parents: 5323 diff changeset	238	$ hg obslog --all
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	239	@ 4e844ab5e814 (15) added foo to x
5349 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5345 diff changeset	240	\|\ rewritten(description, branch, content) from 45e15d6e88f5 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5345 diff changeset	241	\| \| rewritten from 911c21adca13 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5345 diff changeset	242	\| \|
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	243	x \| 45e15d6e88f5 (13) added x
5349 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5345 diff changeset	244	\| \| rebased(parent) from 801b5920c7ea using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
5324 c834fdb87f90 tests: add more verification of output to divergence tests Martin von Zweigbergk <martinvonz@google.com> parents: 5323 diff changeset	245	\| \|
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	246	\| x 911c21adca13 (14) added foo to x
5349 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5345 diff changeset	247	\| \| rebased(parent) from 5cf74a13db18 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
5324 c834fdb87f90 tests: add more verification of output to divergence tests Martin von Zweigbergk <martinvonz@google.com> parents: 5323 diff changeset	248	\| \|
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	249	\| x 5cf74a13db18 (12) added foo to x
5349 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5345 diff changeset	250	\|/ rewritten(description, branch, content) from 801b5920c7ea using amend by test (Thu Jan 01 00:00:00 1970 +0000)
5324 c834fdb87f90 tests: add more verification of output to divergence tests Martin von Zweigbergk <martinvonz@google.com> parents: 5323 diff changeset	251	\|
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	252	x 801b5920c7ea (11) added x
5324 c834fdb87f90 tests: add more verification of output to divergence tests Martin von Zweigbergk <martinvonz@google.com> parents: 5323 diff changeset	253
c834fdb87f90 tests: add more verification of output to divergence tests Martin von Zweigbergk <martinvonz@google.com> parents: 5323 diff changeset	254
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	255	Testing when both the content-divergence are on different parents and resolution
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	256	will lead to conflicts
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	257	---------------------------------------------------------------------------------
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	258
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	259	$ hg up .^^^
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	260	0 files updated, 0 files merged, 3 files removed, 0 files unresolved
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	261
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	262	$ echo y > y
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	263	$ hg ci -Aqm "added y"
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	264	$ hg glog -r .
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	265	@ 16:ecf1d3992eb4 added y
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	266	\| () [default] draft
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	267	~
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	268
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	269	$ echo bar > y
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	270	$ hg amend
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	271
5325 304de9a04172 tests: avoid referring to commits by hash in a few places Martin von Zweigbergk <martinvonz@google.com> parents: 5324 diff changeset	272	$ hg up 'predecessors(.)' --hidden
5368 844b1ad5b34b test-compat: merge mercurial-4.7 into mercurial-4.6 Anton Shestakov <av6@dwimlabs.net> parents: 5163 5367 diff changeset	273	updating to a hidden changeset ecf1d3992eb4
844b1ad5b34b test-compat: merge mercurial-4.7 into mercurial-4.6 Anton Shestakov <av6@dwimlabs.net> parents: 5163 5367 diff changeset	274	(hidden revision 'ecf1d3992eb4' was rewritten as: 9c32d35206fb)
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	275	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	276	working directory parent is obsolete! (ecf1d3992eb4)
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	277	(use 'hg evolve' to update to its successor: 9c32d35206fb)
5325 304de9a04172 tests: avoid referring to commits by hash in a few places Martin von Zweigbergk <martinvonz@google.com> parents: 5324 diff changeset	278	$ hg rebase -r . -d 'desc("added foo to x")' --config experimental.evolution.allowdivergence=True
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	279	rebasing 16:ecf1d3992eb4 "added y"
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	280	2 new content-divergent changesets
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	281	$ echo wat > y
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	282	$ hg amend
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	283
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	284	$ hg glog
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	285	@ 19:0faa43228ee7 added y
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	286	\| () [bar] draft
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	287	\| * 17:9c32d35206fb added y
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	288	\| \| () [default] draft
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	289	o \| 15:4e844ab5e814 added foo to x
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	290	\| \| () [bar] draft
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	291	o \| 10:be5a8b9faa8a added d
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	292	\| \| () [default] draft
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	293	o \| 9:e2ce33033e42 added c
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	294	\|/ () [default] draft
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	295	o 8:e7fdc662d630 added b
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	296	\| () [default] draft
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	297	o 1:c7586e2a9264 added a
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	298	\| () [default] draft
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	299	o 0:8fa14d15e168 added hgignore
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	300	() [default] draft
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	301
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	302	$ hg evolve --content-divergent
3846 f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents Pulkit Goyal <7895pulkit@gmail.com> parents: 3845 diff changeset	303	merge:[19] added y
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents Pulkit Goyal <7895pulkit@gmail.com> parents: 3845 diff changeset	304	with: [17] added y
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents Pulkit Goyal <7895pulkit@gmail.com> parents: 3845 diff changeset	305	base: [16] added y
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	306	rebasing "other" content-divergent changeset 9c32d35206fb on 4e844ab5e814
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	307	merging y
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	308	warning: conflicts while merging y! (edit, then use 'hg resolve --mark')
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	309	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: 4633 diff changeset	310	unresolved merge conflicts
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them Anton Shestakov <av6@dwimlabs.net> parents: 4633 diff changeset	311	(see 'hg help evolve.interrupted')
3852 629558d09898 evolve: raise error.InterventionRequired instead of Abort when conflicts Pulkit Goyal <7895pulkit@gmail.com> parents: 3850 diff changeset	312	[1]
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	313
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	314	$ echo watbar > y
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	315	$ hg resolve -m
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	316	(no more unresolved files)
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	317	continue: hg evolve --continue
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	318	$ hg evolve --continue
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	319	working directory is now at ba11a9f47a2e
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	320
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	321	$ hg glog
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	322	@ 21:ba11a9f47a2e added y
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	323	\| () [bar] draft
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	324	o 15:4e844ab5e814 added foo to x
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	325	\| () [bar] draft
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	326	o 10:be5a8b9faa8a added d
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	327	\| () [default] draft
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	328	o 9:e2ce33033e42 added c
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	329	\| () [default] draft
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	330	o 8:e7fdc662d630 added b
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	331	\| () [default] draft
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	332	o 1:c7586e2a9264 added a
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	333	\| () [default] draft
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	334	o 0:8fa14d15e168 added hgignore
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	335	() [default] draft
99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	336
5323 417503ef667d tests: add debugobsolete calls before many obslog calls Martin von Zweigbergk <martinvonz@google.com> parents: 5123 diff changeset	337	$ hg debugobsolete
417503ef667d tests: add debugobsolete calls before many obslog calls Martin von Zweigbergk <martinvonz@google.com> parents: 5123 diff changeset	338	b1661037fa25511d0b7ccddf405e336f9d7d3424 7ed0642d644bb9ad93d252dd9ffe7b4729febe48 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
417503ef667d tests: add debugobsolete calls before many obslog calls Martin von Zweigbergk <martinvonz@google.com> parents: 5123 diff changeset	339	b1661037fa25511d0b7ccddf405e336f9d7d3424 da4b96f4a8d610a85b225583138f681d67e275dd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
417503ef667d tests: add debugobsolete calls before many obslog calls Martin von Zweigbergk <martinvonz@google.com> parents: 5123 diff changeset	340	da4b96f4a8d610a85b225583138f681d67e275dd 11f849d7159fa30a63dbbc1a6d251a8d996baeb5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	341	7ed0642d644bb9ad93d252dd9ffe7b4729febe48 e7fdc662d6305fee2908c3f1630e0b20d6f4689a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	342	11f849d7159fa30a63dbbc1a6d251a8d996baeb5 e7fdc662d6305fee2908c3f1630e0b20d6f4689a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	343	ca1b80f7960aae2306287bab52b4090c59af8c29 e2ce33033e42db2e61a5f71c6dfb52a33efeaf6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	344	c41c793e0ef1ddb463e85ea9491e377d01127ba2 be5a8b9faa8af54f115aa168a2c8564acb40c37d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	345	801b5920c7ea8d4ebdbc9cfc1e79e665dea2f211 5cf74a13db180e33dc2df8cd2aa70b21252a2a64 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'amend', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	346	801b5920c7ea8d4ebdbc9cfc1e79e665dea2f211 45e15d6e88f5bd23ba360dff0c7591eca2d99f43 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	347	5cf74a13db180e33dc2df8cd2aa70b21252a2a64 911c21adca136894a2b35f0a58fae7ee94fa5e61 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	348	45e15d6e88f5bd23ba360dff0c7591eca2d99f43 4e844ab5e8142d26fb1f0990486379f2410b0358 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'evolve', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	349	911c21adca136894a2b35f0a58fae7ee94fa5e61 4e844ab5e8142d26fb1f0990486379f2410b0358 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	350	ecf1d3992eb4d9700d441013fc4e89014692b461 9c32d35206fb5c3bf0ac814d410914d54a959a87 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	351	ecf1d3992eb4d9700d441013fc4e89014692b461 1bb9315961377c18863281be7634ec8ff9b73ea9 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '68', 'operation': 'rebase', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	352	1bb9315961377c18863281be7634ec8ff9b73ea9 0faa43228ee7fb9c993f076cef7e2ac14c85954b 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	353	9c32d35206fb5c3bf0ac814d410914d54a959a87 0fc12918c8daa12ca83ce1e2a38e252b063b6276 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	354	0faa43228ee7fb9c993f076cef7e2ac14c85954b ba11a9f47a2e4a3380c4d5f80f64de41645a6681 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	355	0fc12918c8daa12ca83ce1e2a38e252b063b6276 ba11a9f47a2e4a3380c4d5f80f64de41645a6681 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '72', 'operation': 'evolve', 'user': 'test'}
3807 03ccdc753582 evolve: commit the transaction if conflicts occur while merging content-div Pulkit Goyal <7895pulkit@gmail.com> parents: 3806 diff changeset	356	$ hg obslog -r . --all
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	357	@ ba11a9f47a2e (21) added y
5349 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5345 diff changeset	358	\|\ amended(content) from 0faa43228ee7 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5345 diff changeset	359	\| \| rewritten(branch, content) from 0fc12918c8da using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5345 diff changeset	360	\| \|
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	361	x \| 0faa43228ee7 (19) added y
5349 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5345 diff changeset	362	\| \| amended(content) from 1bb931596137 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3807 03ccdc753582 evolve: commit the transaction if conflicts occur while merging content-div Pulkit Goyal <7895pulkit@gmail.com> parents: 3806 diff changeset	363	\| \|
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	364	\| x 0fc12918c8da (20) added y
5349 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5345 diff changeset	365	\| \| rebased(parent) from 9c32d35206fb using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
3809 f06ff8fee2f6 evolvestate: store info about relocation while resolving content-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: 3807 diff changeset	366	\| \|
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	367	x \| 1bb931596137 (18) added y
5349 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5345 diff changeset	368	\| \| rewritten(branch, parent) from ecf1d3992eb4 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
3809 f06ff8fee2f6 evolvestate: store info about relocation while resolving content-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: 3807 diff changeset	369	\| \|
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	370	\| x 9c32d35206fb (17) added y
5349 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5345 diff changeset	371	\|/ amended(content) from ecf1d3992eb4 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3807 03ccdc753582 evolve: commit the transaction if conflicts occur while merging content-div Pulkit Goyal <7895pulkit@gmail.com> parents: 3806 diff changeset	372	\|
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	373	x ecf1d3992eb4 (16) added y
3807 03ccdc753582 evolve: commit the transaction if conflicts occur while merging content-div Pulkit Goyal <7895pulkit@gmail.com> parents: 3806 diff changeset	374
03ccdc753582 evolve: commit the transaction if conflicts occur while merging content-div Pulkit Goyal <7895pulkit@gmail.com> parents: 3806 diff changeset	375
3806 99469bb3854e tests: add tests for resolving content-divergence when different parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3805 diff changeset	376	checking that relocated commit is there
5325 304de9a04172 tests: avoid referring to commits by hash in a few places Martin von Zweigbergk <martinvonz@google.com> parents: 5324 diff changeset	377	$ hg exp 20 --hidden
3807 03ccdc753582 evolve: commit the transaction if conflicts occur while merging content-div Pulkit Goyal <7895pulkit@gmail.com> parents: 3806 diff changeset	378	# HG changeset patch
03ccdc753582 evolve: commit the transaction if conflicts occur while merging content-div Pulkit Goyal <7895pulkit@gmail.com> parents: 3806 diff changeset	379	# User test
03ccdc753582 evolve: commit the transaction if conflicts occur while merging content-div Pulkit Goyal <7895pulkit@gmail.com> parents: 3806 diff changeset	380	# Date 0 0
03ccdc753582 evolve: commit the transaction if conflicts occur while merging content-div Pulkit Goyal <7895pulkit@gmail.com> parents: 3806 diff changeset	381	# Thu Jan 01 00:00:00 1970 +0000
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	382	# Node ID 0fc12918c8daa12ca83ce1e2a38e252b063b6276
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	383	# Parent 4e844ab5e8142d26fb1f0990486379f2410b0358
3807 03ccdc753582 evolve: commit the transaction if conflicts occur while merging content-div Pulkit Goyal <7895pulkit@gmail.com> parents: 3806 diff changeset	384	added y
03ccdc753582 evolve: commit the transaction if conflicts occur while merging content-div Pulkit Goyal <7895pulkit@gmail.com> parents: 3806 diff changeset	385
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	386	diff -r 4e844ab5e814 -r 0fc12918c8da y
3807 03ccdc753582 evolve: commit the transaction if conflicts occur while merging content-div Pulkit Goyal <7895pulkit@gmail.com> parents: 3806 diff changeset	387	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
03ccdc753582 evolve: commit the transaction if conflicts occur while merging content-div Pulkit Goyal <7895pulkit@gmail.com> parents: 3806 diff changeset	388	+++ b/y Thu Jan 01 00:00:00 1970 +0000
03ccdc753582 evolve: commit the transaction if conflicts occur while merging content-div Pulkit Goyal <7895pulkit@gmail.com> parents: 3806 diff changeset	389	@@ -0,0 +1,1 @@
03ccdc753582 evolve: commit the transaction if conflicts occur while merging content-div Pulkit Goyal <7895pulkit@gmail.com> parents: 3806 diff changeset	390	+bar
3810 04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	391
4406 450487b4e1a3 tests: update the title of a test as it's not what it says Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4181 diff changeset	392	Testing when the relocation will result in conflicts and merging also:
3810 04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	393	----------------------------------------------------------------------
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	394
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	395	$ hg glog
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	396	@ 21:ba11a9f47a2e added y
3810 04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	397	\| () [bar] draft
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	398	o 15:4e844ab5e814 added foo to x
3810 04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	399	\| () [bar] draft
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	400	o 10:be5a8b9faa8a added d
3810 04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	401	\| () [default] draft
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	402	o 9:e2ce33033e42 added c
3810 04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	403	\| () [default] draft
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	404	o 8:e7fdc662d630 added b
3810 04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	405	\| () [default] draft
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	406	o 1:c7586e2a9264 added a
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	407	\| () [default] draft
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	408	o 0:8fa14d15e168 added hgignore
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	409	() [default] draft
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	410
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	411	$ hg up .^^^^
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	412	0 files updated, 0 files merged, 4 files removed, 0 files unresolved
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	413
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	414	$ echo z > z
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	415	$ hg ci -Aqm "added z"
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	416	$ hg glog -r .
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	417	@ 22:2048a66e8834 added z
3810 04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	418	\| () [default] draft
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	419	~
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	420
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	421	$ echo foo > y
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	422	$ hg add y
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	423	$ hg amend
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	424
5325 304de9a04172 tests: avoid referring to commits by hash in a few places Martin von Zweigbergk <martinvonz@google.com> parents: 5324 diff changeset	425	$ hg up 'predecessors(.)' --hidden
5368 844b1ad5b34b test-compat: merge mercurial-4.7 into mercurial-4.6 Anton Shestakov <av6@dwimlabs.net> parents: 5163 5367 diff changeset	426	updating to a hidden changeset 2048a66e8834
844b1ad5b34b test-compat: merge mercurial-4.7 into mercurial-4.6 Anton Shestakov <av6@dwimlabs.net> parents: 5163 5367 diff changeset	427	(hidden revision '2048a66e8834' was rewritten as: 9bc2ace42175)
3810 04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	428	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	429	working directory parent is obsolete! (2048a66e8834)
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	430	(use 'hg evolve' to update to its successor: 9bc2ace42175)
5325 304de9a04172 tests: avoid referring to commits by hash in a few places Martin von Zweigbergk <martinvonz@google.com> parents: 5324 diff changeset	431	$ hg rebase -r . -d 'desc("added y")' --config experimental.evolution.allowdivergence=True
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	432	rebasing 22:2048a66e8834 "added z"
3810 04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	433	2 new content-divergent changesets
3811 3273b178c202 evolve: store the evolvestate if relocation results in conflicts Pulkit Goyal <7895pulkit@gmail.com> parents: 3810 diff changeset	434	$ echo bar > z
3273b178c202 evolve: store the evolvestate if relocation results in conflicts Pulkit Goyal <7895pulkit@gmail.com> parents: 3810 diff changeset	435	$ hg amend
3810 04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	436
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	437	$ hg glog
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	438	@ 25:ad2ec16eca1e added z
3810 04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	439	\| () [bar] draft
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	440	\| * 23:9bc2ace42175 added z
3810 04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	441	\| \| () [default] draft
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	442	o \| 21:ba11a9f47a2e added y
3810 04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	443	\| \| () [bar] draft
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	444	o \| 15:4e844ab5e814 added foo to x
3810 04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	445	\| \| () [bar] draft
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	446	o \| 10:be5a8b9faa8a added d
3810 04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	447	\| \| () [default] draft
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	448	o \| 9:e2ce33033e42 added c
3810 04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	449	\|/ () [default] draft
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	450	o 8:e7fdc662d630 added b
3810 04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	451	\| () [default] draft
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	452	o 1:c7586e2a9264 added a
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	453	\| () [default] draft
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	454	o 0:8fa14d15e168 added hgignore
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	455	() [default] draft
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	456
4407 7fd0cbf6190d evolve: change in a test which demonstrate divergence resolution can break Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4406 diff changeset	457	$ hg evolve --content-divergent --any
3846 f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents Pulkit Goyal <7895pulkit@gmail.com> parents: 3845 diff changeset	458	merge:[25] added z
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents Pulkit Goyal <7895pulkit@gmail.com> parents: 3845 diff changeset	459	with: [23] added z
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents Pulkit Goyal <7895pulkit@gmail.com> parents: 3845 diff changeset	460	base: [22] added z
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	461	rebasing "other" content-divergent changeset 9bc2ace42175 on ba11a9f47a2e
3810 04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	462	merging y
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	463	warning: conflicts while merging y! (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: 4633 diff changeset	464	unresolved merge conflicts
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them Anton Shestakov <av6@dwimlabs.net> parents: 4633 diff changeset	465	(see 'hg help evolve.interrupted')
3853 796334340cad evolve: make one missed error to align other error messages Pulkit Goyal <7895pulkit@gmail.com> parents: 3852 diff changeset	466	[1]
3810 04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	467
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	468	$ hg diff
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	469	diff -r ba11a9f47a2e y
3810 04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	470	--- a/y Thu Jan 01 00:00:00 1970 +0000
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	471	+++ b/y Thu Jan 01 00:00:00 1970 +0000
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	472	@@ -1,1 +1,5 @@
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	473	+<<<<<<< destination: ba11a9f47a2e bar - test: added y
3810 04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	474	watbar
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	475	+=======
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	476	+foo
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	477	+>>>>>>> evolving: 9bc2ace42175 - test: added z
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	478	diff -r ba11a9f47a2e z
3810 04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	479	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	480	+++ b/z Thu Jan 01 00:00:00 1970 +0000
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	481	@@ -0,0 +1,1 @@
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	482	+z
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	483
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	484	$ echo foo > y
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	485	$ hg resolve -m
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	486	(no more unresolved files)
3811 3273b178c202 evolve: store the evolvestate if relocation results in conflicts Pulkit Goyal <7895pulkit@gmail.com> parents: 3810 diff changeset	487	continue: hg evolve --continue
3810 04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	488
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	489	$ hg evolve --continue
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	490	evolving 23:9bc2ace42175 "added z"
3882 55b8c7e7e352 compat: temporarily move copies fix to compat.py Pulkit Goyal <7895pulkit@gmail.com> parents: 3881 diff changeset	491	merging y
55b8c7e7e352 compat: temporarily move copies fix to compat.py Pulkit Goyal <7895pulkit@gmail.com> parents: 3881 diff changeset	492	warning: conflicts while merging y! (edit, then use 'hg resolve --mark')
55b8c7e7e352 compat: temporarily move copies fix to compat.py Pulkit Goyal <7895pulkit@gmail.com> parents: 3881 diff changeset	493	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: 4633 diff changeset	494	unresolved merge conflicts
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them Anton Shestakov <av6@dwimlabs.net> parents: 4633 diff changeset	495	(see 'hg help evolve.interrupted')
3881 9cf45b94f977 evolve: continue conflicted relocation content-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: 3853 diff changeset	496	[1]
9cf45b94f977 evolve: continue conflicted relocation content-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: 3853 diff changeset	497
9cf45b94f977 evolve: continue conflicted relocation content-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: 3853 diff changeset	498	$ hg diff
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	499	diff -r ad2ec16eca1e y
3882 55b8c7e7e352 compat: temporarily move copies fix to compat.py Pulkit Goyal <7895pulkit@gmail.com> parents: 3881 diff changeset	500	--- a/y Thu Jan 01 00:00:00 1970 +0000
55b8c7e7e352 compat: temporarily move copies fix to compat.py Pulkit Goyal <7895pulkit@gmail.com> parents: 3881 diff changeset	501	+++ b/y Thu Jan 01 00:00:00 1970 +0000
55b8c7e7e352 compat: temporarily move copies fix to compat.py Pulkit Goyal <7895pulkit@gmail.com> parents: 3881 diff changeset	502	@@ -1,1 +1,5 @@
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	503	+<<<<<<< local: ad2ec16eca1e bar - test: added z
3882 55b8c7e7e352 compat: temporarily move copies fix to compat.py Pulkit Goyal <7895pulkit@gmail.com> parents: 3881 diff changeset	504	watbar
55b8c7e7e352 compat: temporarily move copies fix to compat.py Pulkit Goyal <7895pulkit@gmail.com> parents: 3881 diff changeset	505	+=======
55b8c7e7e352 compat: temporarily move copies fix to compat.py Pulkit Goyal <7895pulkit@gmail.com> parents: 3881 diff changeset	506	+foo
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	507	+>>>>>>> other: a7326a078527 - test: added z
3881 9cf45b94f977 evolve: continue conflicted relocation content-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: 3853 diff changeset	508
9cf45b94f977 evolve: continue conflicted relocation content-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: 3853 diff changeset	509	$ echo foo > y
9cf45b94f977 evolve: continue conflicted relocation content-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: 3853 diff changeset	510	$ hg resolve -m
3882 55b8c7e7e352 compat: temporarily move copies fix to compat.py Pulkit Goyal <7895pulkit@gmail.com> parents: 3881 diff changeset	511	(no more unresolved files)
55b8c7e7e352 compat: temporarily move copies fix to compat.py Pulkit Goyal <7895pulkit@gmail.com> parents: 3881 diff changeset	512	continue: hg evolve --continue
3881 9cf45b94f977 evolve: continue conflicted relocation content-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: 3853 diff changeset	513	$ hg evolve --continue
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	514	working directory is now at 45e55c9ab3d0
3810 04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	515
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	516	$ hg glog
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	517	@ 27:45e55c9ab3d0 added z
3882 55b8c7e7e352 compat: temporarily move copies fix to compat.py Pulkit Goyal <7895pulkit@gmail.com> parents: 3881 diff changeset	518	\| () [bar] draft
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	519	o 21:ba11a9f47a2e added y
3810 04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	520	\| () [bar] draft
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	521	o 15:4e844ab5e814 added foo to x
3882 55b8c7e7e352 compat: temporarily move copies fix to compat.py Pulkit Goyal <7895pulkit@gmail.com> parents: 3881 diff changeset	522	\| () [bar] draft
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	523	o 10:be5a8b9faa8a added d
3882 55b8c7e7e352 compat: temporarily move copies fix to compat.py Pulkit Goyal <7895pulkit@gmail.com> parents: 3881 diff changeset	524	\| () [default] draft
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	525	o 9:e2ce33033e42 added c
3882 55b8c7e7e352 compat: temporarily move copies fix to compat.py Pulkit Goyal <7895pulkit@gmail.com> parents: 3881 diff changeset	526	\| () [default] draft
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	527	o 8:e7fdc662d630 added b
3810 04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	528	\| () [default] draft
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	529	o 1:c7586e2a9264 added a
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	530	\| () [default] draft
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	531	o 0:8fa14d15e168 added hgignore
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets Pulkit Goyal <7895pulkit@gmail.com> parents: 3809 diff changeset	532	() [default] draft
3811 3273b178c202 evolve: store the evolvestate if relocation results in conflicts Pulkit Goyal <7895pulkit@gmail.com> parents: 3810 diff changeset	533
3273b178c202 evolve: store the evolvestate if relocation results in conflicts Pulkit Goyal <7895pulkit@gmail.com> parents: 3810 diff changeset	534	$ hg exp
3273b178c202 evolve: store the evolvestate if relocation results in conflicts Pulkit Goyal <7895pulkit@gmail.com> parents: 3810 diff changeset	535	# HG changeset patch
3273b178c202 evolve: store the evolvestate if relocation results in conflicts Pulkit Goyal <7895pulkit@gmail.com> parents: 3810 diff changeset	536	# User test
3273b178c202 evolve: store the evolvestate if relocation results in conflicts Pulkit Goyal <7895pulkit@gmail.com> parents: 3810 diff changeset	537	# Date 0 0
3273b178c202 evolve: store the evolvestate if relocation results in conflicts Pulkit Goyal <7895pulkit@gmail.com> parents: 3810 diff changeset	538	# Thu Jan 01 00:00:00 1970 +0000
3881 9cf45b94f977 evolve: continue conflicted relocation content-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: 3853 diff changeset	539	# Branch bar
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	540	# Node ID 45e55c9ab3d0b4746161fcbe5b6c062eb4647fdb
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	541	# Parent ba11a9f47a2e4a3380c4d5f80f64de41645a6681
3882 55b8c7e7e352 compat: temporarily move copies fix to compat.py Pulkit Goyal <7895pulkit@gmail.com> parents: 3881 diff changeset	542	added z
3811 3273b178c202 evolve: store the evolvestate if relocation results in conflicts Pulkit Goyal <7895pulkit@gmail.com> parents: 3810 diff changeset	543
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	544	diff -r ba11a9f47a2e -r 45e55c9ab3d0 y
3882 55b8c7e7e352 compat: temporarily move copies fix to compat.py Pulkit Goyal <7895pulkit@gmail.com> parents: 3881 diff changeset	545	--- a/y Thu Jan 01 00:00:00 1970 +0000
3811 3273b178c202 evolve: store the evolvestate if relocation results in conflicts Pulkit Goyal <7895pulkit@gmail.com> parents: 3810 diff changeset	546	+++ b/y Thu Jan 01 00:00:00 1970 +0000
3882 55b8c7e7e352 compat: temporarily move copies fix to compat.py Pulkit Goyal <7895pulkit@gmail.com> parents: 3881 diff changeset	547	@@ -1,1 +1,1 @@
55b8c7e7e352 compat: temporarily move copies fix to compat.py Pulkit Goyal <7895pulkit@gmail.com> parents: 3881 diff changeset	548	-watbar
55b8c7e7e352 compat: temporarily move copies fix to compat.py Pulkit Goyal <7895pulkit@gmail.com> parents: 3881 diff changeset	549	+foo
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	550	diff -r ba11a9f47a2e -r 45e55c9ab3d0 z
3882 55b8c7e7e352 compat: temporarily move copies fix to compat.py Pulkit Goyal <7895pulkit@gmail.com> parents: 3881 diff changeset	551	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
55b8c7e7e352 compat: temporarily move copies fix to compat.py Pulkit Goyal <7895pulkit@gmail.com> parents: 3881 diff changeset	552	+++ b/z Thu Jan 01 00:00:00 1970 +0000
3811 3273b178c202 evolve: store the evolvestate if relocation results in conflicts Pulkit Goyal <7895pulkit@gmail.com> parents: 3810 diff changeset	553	@@ -0,0 +1,1 @@
3882 55b8c7e7e352 compat: temporarily move copies fix to compat.py Pulkit Goyal <7895pulkit@gmail.com> parents: 3881 diff changeset	554	+bar
3844 48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	555
5324 c834fdb87f90 tests: add more verification of output to divergence tests Martin von Zweigbergk <martinvonz@google.com> parents: 5323 diff changeset	556	$ hg debugobsolete
c834fdb87f90 tests: add more verification of output to divergence tests Martin von Zweigbergk <martinvonz@google.com> parents: 5323 diff changeset	557	b1661037fa25511d0b7ccddf405e336f9d7d3424 7ed0642d644bb9ad93d252dd9ffe7b4729febe48 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
c834fdb87f90 tests: add more verification of output to divergence tests Martin von Zweigbergk <martinvonz@google.com> parents: 5323 diff changeset	558	b1661037fa25511d0b7ccddf405e336f9d7d3424 da4b96f4a8d610a85b225583138f681d67e275dd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
c834fdb87f90 tests: add more verification of output to divergence tests Martin von Zweigbergk <martinvonz@google.com> parents: 5323 diff changeset	559	da4b96f4a8d610a85b225583138f681d67e275dd 11f849d7159fa30a63dbbc1a6d251a8d996baeb5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	560	7ed0642d644bb9ad93d252dd9ffe7b4729febe48 e7fdc662d6305fee2908c3f1630e0b20d6f4689a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	561	11f849d7159fa30a63dbbc1a6d251a8d996baeb5 e7fdc662d6305fee2908c3f1630e0b20d6f4689a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	562	ca1b80f7960aae2306287bab52b4090c59af8c29 e2ce33033e42db2e61a5f71c6dfb52a33efeaf6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	563	c41c793e0ef1ddb463e85ea9491e377d01127ba2 be5a8b9faa8af54f115aa168a2c8564acb40c37d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	564	801b5920c7ea8d4ebdbc9cfc1e79e665dea2f211 5cf74a13db180e33dc2df8cd2aa70b21252a2a64 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'amend', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	565	801b5920c7ea8d4ebdbc9cfc1e79e665dea2f211 45e15d6e88f5bd23ba360dff0c7591eca2d99f43 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	566	5cf74a13db180e33dc2df8cd2aa70b21252a2a64 911c21adca136894a2b35f0a58fae7ee94fa5e61 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	567	45e15d6e88f5bd23ba360dff0c7591eca2d99f43 4e844ab5e8142d26fb1f0990486379f2410b0358 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'evolve', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	568	911c21adca136894a2b35f0a58fae7ee94fa5e61 4e844ab5e8142d26fb1f0990486379f2410b0358 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	569	ecf1d3992eb4d9700d441013fc4e89014692b461 9c32d35206fb5c3bf0ac814d410914d54a959a87 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	570	ecf1d3992eb4d9700d441013fc4e89014692b461 1bb9315961377c18863281be7634ec8ff9b73ea9 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '68', 'operation': 'rebase', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	571	1bb9315961377c18863281be7634ec8ff9b73ea9 0faa43228ee7fb9c993f076cef7e2ac14c85954b 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	572	9c32d35206fb5c3bf0ac814d410914d54a959a87 0fc12918c8daa12ca83ce1e2a38e252b063b6276 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	573	0faa43228ee7fb9c993f076cef7e2ac14c85954b ba11a9f47a2e4a3380c4d5f80f64de41645a6681 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	574	0fc12918c8daa12ca83ce1e2a38e252b063b6276 ba11a9f47a2e4a3380c4d5f80f64de41645a6681 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '72', 'operation': 'evolve', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	575	2048a66e8834bda866dcc8c479f091897816833e 9bc2ace42175da7380251fca97730f62ff5b9185 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	576	2048a66e8834bda866dcc8c479f091897816833e ee19d6cc67048a1a7469268068a1413611720975 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '68', 'operation': 'rebase', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	577	ee19d6cc67048a1a7469268068a1413611720975 ad2ec16eca1eac4cf5045b496efa6205652e9a02 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	578	9bc2ace42175da7380251fca97730f62ff5b9185 a7326a0785271a7bef2e812a9a742fb4256b4a3c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '12', 'operation': 'evolve', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	579	ad2ec16eca1eac4cf5045b496efa6205652e9a02 45e55c9ab3d0b4746161fcbe5b6c062eb4647fdb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	580	a7326a0785271a7bef2e812a9a742fb4256b4a3c 45e55c9ab3d0b4746161fcbe5b6c062eb4647fdb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '72', 'operation': 'evolve', 'user': 'test'}
5324 c834fdb87f90 tests: add more verification of output to divergence tests Martin von Zweigbergk <martinvonz@google.com> parents: 5323 diff changeset	581	$ hg obslog --all
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	582	@ 45e55c9ab3d0 (27) added z
5349 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5345 diff changeset	583	\|\ rewritten(branch, content) from a7326a078527 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5345 diff changeset	584	\| \| amended(content) from ad2ec16eca1e using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5345 diff changeset	585	\| \|
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	586	x \| a7326a078527 (26) added z
5349 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5345 diff changeset	587	\| \| rewritten(parent, content) from 9bc2ace42175 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
5324 c834fdb87f90 tests: add more verification of output to divergence tests Martin von Zweigbergk <martinvonz@google.com> parents: 5323 diff changeset	588	\| \|
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	589	\| x ad2ec16eca1e (25) added z
5349 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5345 diff changeset	590	\| \| amended(content) from ee19d6cc6704 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
5324 c834fdb87f90 tests: add more verification of output to divergence tests Martin von Zweigbergk <martinvonz@google.com> parents: 5323 diff changeset	591	\| \|
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	592	x \| 9bc2ace42175 (23) added z
5349 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5345 diff changeset	593	\| \| amended(content) from 2048a66e8834 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
5324 c834fdb87f90 tests: add more verification of output to divergence tests Martin von Zweigbergk <martinvonz@google.com> parents: 5323 diff changeset	594	\| \|
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	595	\| x ee19d6cc6704 (24) added z
5349 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5345 diff changeset	596	\|/ rewritten(branch, parent) from 2048a66e8834 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
5324 c834fdb87f90 tests: add more verification of output to divergence tests Martin von Zweigbergk <martinvonz@google.com> parents: 5323 diff changeset	597	\|
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	598	x 2048a66e8834 (22) added z
5324 c834fdb87f90 tests: add more verification of output to divergence tests Martin von Zweigbergk <martinvonz@google.com> parents: 5323 diff changeset	599
c834fdb87f90 tests: add more verification of output to divergence tests Martin von Zweigbergk <martinvonz@google.com> parents: 5323 diff changeset	600
3844 48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	601	$ cd ..
5342 265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	602
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	603	Testing when relocation results in nothing to commit
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	604	----------------------------------------------------
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	605
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	606	Set up a repo where relocation results in no changes to commit because the
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	607	changes from the relocated node are already in the destination.
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	608
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	609	$ hg init nothing-to-commit
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	610	$ cd nothing-to-commit
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	611	$ echo 0 > a
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	612	$ hg ci -Aqm initial
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	613	$ echo 1 > a
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	614	$ hg ci -Aqm upstream
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	615	$ hg prev -q
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	616
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	617	Create the source of divergence.
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	618	$ echo 0 > b
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	619	$ hg ci -Aqm divergent
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	620
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	621	The first side of the divergence get rebased on top of upstream.
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	622	$ hg rebase -r . -d 'desc("upstream")'
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	623	rebasing 2:898ddd4443b3 "divergent" (tip)
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	624	$ hg --hidden co 2 -q
5368 844b1ad5b34b test-compat: merge mercurial-4.7 into mercurial-4.6 Anton Shestakov <av6@dwimlabs.net> parents: 5163 5367 diff changeset	625	updating to a hidden changeset 898ddd4443b3
5342 265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	626	(hidden revision '898ddd4443b3' was rewritten as: befae6138569)
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	627	working directory parent is obsolete! (898ddd4443b3)
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	628
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	629	The other side of the divergence gets amended so it matches upstream.
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	630	Relocation (onto upstream) will therefore result in no changes to commit.
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	631	$ hg revert -r 'desc("upstream")' --all
5367 cb5983c0287f test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5349 diff changeset	632	reverting a
5342 265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	633	removing b
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	634	$ hg amend --config experimental.evolution.allowdivergence=True
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	635	2 new content-divergent changesets
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	636
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	637	Add a commit on top. This one should become an orphan. Evolving it later
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	638	should put it on top of the other divergent side (the one that's on top of
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	639	upstream)
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	640	$ echo 0 > c
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	641	$ hg ci -Aqm child
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	642	$ hg co -q null
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	643	$ hg glog
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	644	o 5:88473f9137d1 child
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	645	\| () [default] draft
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	646	* 4:4cc21313ecee divergent
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	647	\| () [default] draft
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	648	\| * 3:befae6138569 divergent
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	649	\| \| () [default] draft
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	650	\| o 1:33c576d20069 upstream
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	651	\|/ () [default] draft
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	652	o 0:98a3f8f02ba7 initial
265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	653	() [default] draft
5343 ebfd0d875600 evolve: handle relocation during divergence resolution producing no changes Martin von Zweigbergk <martinvonz@google.com> parents: 5342 diff changeset	654	$ hg evolve --content-divergent
ebfd0d875600 evolve: handle relocation during divergence resolution producing no changes Martin von Zweigbergk <martinvonz@google.com> parents: 5342 diff changeset	655	merge:[3] divergent
ebfd0d875600 evolve: handle relocation during divergence resolution producing no changes Martin von Zweigbergk <martinvonz@google.com> parents: 5342 diff changeset	656	with: [4] divergent
ebfd0d875600 evolve: handle relocation during divergence resolution producing no changes Martin von Zweigbergk <martinvonz@google.com> parents: 5342 diff changeset	657	base: [2] divergent
ebfd0d875600 evolve: handle relocation during divergence resolution producing no changes Martin von Zweigbergk <martinvonz@google.com> parents: 5342 diff changeset	658	rebasing "other" content-divergent changeset 4cc21313ecee on 33c576d20069
ebfd0d875600 evolve: handle relocation during divergence resolution producing no changes Martin von Zweigbergk <martinvonz@google.com> parents: 5342 diff changeset	659	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
ebfd0d875600 evolve: handle relocation during divergence resolution producing no changes Martin von Zweigbergk <martinvonz@google.com> parents: 5342 diff changeset	660	1 new orphan changesets
ebfd0d875600 evolve: handle relocation during divergence resolution producing no changes Martin von Zweigbergk <martinvonz@google.com> parents: 5342 diff changeset	661	$ hg glog
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	662	o 7:cc3d0c6117c7 divergent
5343 ebfd0d875600 evolve: handle relocation during divergence resolution producing no changes Martin von Zweigbergk <martinvonz@google.com> parents: 5342 diff changeset	663	\| () [default] draft
ebfd0d875600 evolve: handle relocation during divergence resolution producing no changes Martin von Zweigbergk <martinvonz@google.com> parents: 5342 diff changeset	664	\| * 5:88473f9137d1 child
ebfd0d875600 evolve: handle relocation during divergence resolution producing no changes Martin von Zweigbergk <martinvonz@google.com> parents: 5342 diff changeset	665	\| \| () [default] draft
ebfd0d875600 evolve: handle relocation during divergence resolution producing no changes Martin von Zweigbergk <martinvonz@google.com> parents: 5342 diff changeset	666	\| x 4:4cc21313ecee divergent
ebfd0d875600 evolve: handle relocation during divergence resolution producing no changes Martin von Zweigbergk <martinvonz@google.com> parents: 5342 diff changeset	667	\| \| () [default] draft
ebfd0d875600 evolve: handle relocation during divergence resolution producing no changes Martin von Zweigbergk <martinvonz@google.com> parents: 5342 diff changeset	668	o \| 1:33c576d20069 upstream
ebfd0d875600 evolve: handle relocation during divergence resolution producing no changes Martin von Zweigbergk <martinvonz@google.com> parents: 5342 diff changeset	669	\|/ () [default] draft
ebfd0d875600 evolve: handle relocation during divergence resolution producing no changes Martin von Zweigbergk <martinvonz@google.com> parents: 5342 diff changeset	670	o 0:98a3f8f02ba7 initial
ebfd0d875600 evolve: handle relocation during divergence resolution producing no changes Martin von Zweigbergk <martinvonz@google.com> parents: 5342 diff changeset	671	() [default] draft
5342 265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	672
5343 ebfd0d875600 evolve: handle relocation during divergence resolution producing no changes Martin von Zweigbergk <martinvonz@google.com> parents: 5342 diff changeset	673	$ hg evolve --any
ebfd0d875600 evolve: handle relocation during divergence resolution producing no changes Martin von Zweigbergk <martinvonz@google.com> parents: 5342 diff changeset	674	move:[5] child
ebfd0d875600 evolve: handle relocation during divergence resolution producing no changes Martin von Zweigbergk <martinvonz@google.com> parents: 5342 diff changeset	675	atop:[7] divergent
ebfd0d875600 evolve: handle relocation during divergence resolution producing no changes Martin von Zweigbergk <martinvonz@google.com> parents: 5342 diff changeset	676	$ hg glog
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	677	o 8:916b4ec3b91f child
5343 ebfd0d875600 evolve: handle relocation during divergence resolution producing no changes Martin von Zweigbergk <martinvonz@google.com> parents: 5342 diff changeset	678	\| () [default] draft
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	679	o 7:cc3d0c6117c7 divergent
5343 ebfd0d875600 evolve: handle relocation during divergence resolution producing no changes Martin von Zweigbergk <martinvonz@google.com> parents: 5342 diff changeset	680	\| () [default] draft
ebfd0d875600 evolve: handle relocation during divergence resolution producing no changes Martin von Zweigbergk <martinvonz@google.com> parents: 5342 diff changeset	681	o 1:33c576d20069 upstream
ebfd0d875600 evolve: handle relocation during divergence resolution producing no changes Martin von Zweigbergk <martinvonz@google.com> parents: 5342 diff changeset	682	\| () [default] draft
ebfd0d875600 evolve: handle relocation during divergence resolution producing no changes Martin von Zweigbergk <martinvonz@google.com> parents: 5342 diff changeset	683	o 0:98a3f8f02ba7 initial
ebfd0d875600 evolve: handle relocation during divergence resolution producing no changes Martin von Zweigbergk <martinvonz@google.com> parents: 5342 diff changeset	684	() [default] draft
ebfd0d875600 evolve: handle relocation during divergence resolution producing no changes Martin von Zweigbergk <martinvonz@google.com> parents: 5342 diff changeset	685	$ hg debugobsolete
ebfd0d875600 evolve: handle relocation during divergence resolution producing no changes Martin von Zweigbergk <martinvonz@google.com> parents: 5342 diff changeset	686	898ddd4443b3d5520bf48f22f9411d5a0751cf2e befae61385695f1ae4b78b030ad91075b2b523ef 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
ebfd0d875600 evolve: handle relocation during divergence resolution producing no changes Martin von Zweigbergk <martinvonz@google.com> parents: 5342 diff changeset	687	898ddd4443b3d5520bf48f22f9411d5a0751cf2e 4cc21313ecee97ce33265514a0596a192bfa6b3f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
ebfd0d875600 evolve: handle relocation during divergence resolution producing no changes Martin von Zweigbergk <martinvonz@google.com> parents: 5342 diff changeset	688	4cc21313ecee97ce33265514a0596a192bfa6b3f bf4fe3a3afeb14c338094f41a35863921856592f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '12', 'operation': 'evolve', 'user': 'test'}
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	689	befae61385695f1ae4b78b030ad91075b2b523ef cc3d0c6117c7400995107497370fa4c2138399cd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	690	bf4fe3a3afeb14c338094f41a35863921856592f cc3d0c6117c7400995107497370fa4c2138399cd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	691	88473f9137d12e90055d30bbb9b78dd786520870 916b4ec3b91fd03826bd4b179051ae3cee633b56 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
5343 ebfd0d875600 evolve: handle relocation during divergence resolution producing no changes Martin von Zweigbergk <martinvonz@google.com> parents: 5342 diff changeset	692	$ hg obslog -r 'desc("divergent")' --all
5345 a73cdef2e33f evolve: rename `evolve_source_` to `divergence_source_` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 5344 diff changeset	693	o cc3d0c6117c7 (7) divergent
5349 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5345 diff changeset	694	\|\ amended(content) from befae6138569 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5345 diff changeset	695	\| \| rewritten from bf4fe3a3afeb using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5345 diff changeset	696	\| \|
5343 ebfd0d875600 evolve: handle relocation during divergence resolution producing no changes Martin von Zweigbergk <martinvonz@google.com> parents: 5342 diff changeset	697	x \| befae6138569 (3) divergent
5349 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5345 diff changeset	698	\| \| rebased(parent) from 898ddd4443b3 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
5343 ebfd0d875600 evolve: handle relocation during divergence resolution producing no changes Martin von Zweigbergk <martinvonz@google.com> parents: 5342 diff changeset	699	\| \|
ebfd0d875600 evolve: handle relocation during divergence resolution producing no changes Martin von Zweigbergk <martinvonz@google.com> parents: 5342 diff changeset	700	\| x bf4fe3a3afeb (6) divergent
5349 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5345 diff changeset	701	\| \| rewritten(parent, content) from 4cc21313ecee using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
5343 ebfd0d875600 evolve: handle relocation during divergence resolution producing no changes Martin von Zweigbergk <martinvonz@google.com> parents: 5342 diff changeset	702	\| \|
ebfd0d875600 evolve: handle relocation during divergence resolution producing no changes Martin von Zweigbergk <martinvonz@google.com> parents: 5342 diff changeset	703	\| x 4cc21313ecee (4) divergent
5349 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5345 diff changeset	704	\|/ amended(content) from 898ddd4443b3 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
5343 ebfd0d875600 evolve: handle relocation during divergence resolution producing no changes Martin von Zweigbergk <martinvonz@google.com> parents: 5342 diff changeset	705	\|
ebfd0d875600 evolve: handle relocation during divergence resolution producing no changes Martin von Zweigbergk <martinvonz@google.com> parents: 5342 diff changeset	706	x 898ddd4443b3 (2) divergent
ebfd0d875600 evolve: handle relocation during divergence resolution producing no changes Martin von Zweigbergk <martinvonz@google.com> parents: 5342 diff changeset	707
5342 265e029785ae tests: show crash from divergence resolution resulting in empty commit Martin von Zweigbergk <martinvonz@google.com> parents: 5341 diff changeset	708	$ cd ..

author	Anton Shestakov <av6@dwimlabs.net>
	Fri, 08 May 2020 22:50:09 +0800
branch	mercurial-4.6
changeset 5368	844b1ad5b34b
parent 5163	1752a2e7a226
parent 5367	cb5983c0287f
permissions	-rw-r--r--