evolve: tests/test-evolve-abort-contentdiv.t@bb7d1616407f (annotated)

3773 958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	1	Tests for the --abort flag for `hg evolve` command while content-divergence resolution
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	2	======================================================================================
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	3
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	4	The `--abort` flag aborts the interuppted evolve by undoing all the work which
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	5	was done during resolution i.e. stripping new changesets created, moving
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	6	bookmarks back, moving working directory back.
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	7
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	8	This test contains cases when `hg evolve` is doing content-divergence resolution.
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	9
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	10	Setup
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	11	=====
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	12
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	13	$ cat >> $HGRCPATH <<EOF
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	14	> [phases]
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	15	> publish = False
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	16	> [alias]
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	17	> glog = log -GT "{rev}:{node\|short} {desc}\n ({bookmarks}) {phase}"
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	18	> [extensions]
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	19	> EOF
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	20	$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	21
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	22	$ hg init abortrepo
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	23	$ cd abortrepo
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	24	$ echo ".*\.orig" > .hgignore
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	25	$ hg add .hgignore
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	26	$ hg ci -m "added hgignore"
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	27	$ for ch in a b c d; do echo foo > $ch; hg add $ch; hg ci -qm "added "$ch; done;
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	28
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	29	$ hg glog
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	30	@ 4:c41c793e0ef1 added d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	31	\| () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	32	o 3:ca1b80f7960a added c
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	33	\| () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	34	o 2:b1661037fa25 added b
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	35	\| () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	36	o 1:c7586e2a9264 added a
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	37	\| () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	38	o 0:8fa14d15e168 added hgignore
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	39	() draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	40
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	41	Creating content divergence, resolution of which will lead to conflicts
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	42	-----------------------------------------------------------------------
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	43
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	44	$ echo bar > d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	45	$ hg amend
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	46
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	47	$ hg up c41c793e0ef1 --hidden
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	48	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	49	updated to hidden changeset c41c793e0ef1
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	50	(hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8)
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	51	working directory parent is obsolete! (c41c793e0ef1)
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	52	(use 'hg evolve' to update to its successor: e49523854bc8)
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	53
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	54	$ echo foobar > d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	55	$ hg amend
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	56	2 new content-divergent changesets
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	57	$ hg glog --hidden
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	58	@ 6:9c1631e352d9 added d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	59	\| () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	60	\| * 5:e49523854bc8 added d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	61	\|/ () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	62	\| x 4:c41c793e0ef1 added d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	63	\|/ () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	64	o 3:ca1b80f7960a added c
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	65	\| () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	66	o 2:b1661037fa25 added b
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	67	\| () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	68	o 1:c7586e2a9264 added a
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	69	\| () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	70	o 0:8fa14d15e168 added hgignore
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	71	() draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	72
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	73	$ hg evolve --content-divergent
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	74	merge:[6] added d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	75	with: [5] added d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	76	base: [4] added d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	77	merging "other" content-divergent changeset 'e49523854bc8'
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	78	merging d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	79	warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	80	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	81	abort: fix conflicts and run 'hg evolve --continue' or use 'hg update -C .' to abort
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	82	[255]
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	83
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	84	$ hg evolve --abort
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	85	evolve aborted
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	86	working directory is now at 9c1631e352d9
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	87
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	88	$ hg glog --hidden
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	89	@ 6:9c1631e352d9 added d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	90	\| () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	91	\| * 5:e49523854bc8 added d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	92	\|/ () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	93	\| x 4:c41c793e0ef1 added d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	94	\|/ () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	95	o 3:ca1b80f7960a added c
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	96	\| () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	97	o 2:b1661037fa25 added b
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	98	\| () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	99	o 1:c7586e2a9264 added a
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	100	\| () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	101	o 0:8fa14d15e168 added hgignore
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	102	() draft
3791 63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	103
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	104	Creating multiple content-divergence where resolution of last one results in
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	105	conflicts and resolution of first one resulted in no new commit
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	106	-----------------------------------------------------------------------------
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	107
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	108	$ echo watbar > d
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	109	$ hg amend
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	110	$ hg up .^
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	111	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	112	$ echo bar > c
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	113	$ hg amend
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	114	2 new orphan changesets
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	115	$ hg up ca1b80f7960a --hidden
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	116	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	117	working directory parent is obsolete! (ca1b80f7960a)
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	118	(use 'hg evolve' to update to its successor: 2ba73e31f264)
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	119	$ echo foobar > c
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	120	$ hg amend
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	121	2 new content-divergent changesets
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	122	$ echo bar > c
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	123	$ hg amend
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	124
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	125	$ hg glog --hidden
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	126	@ 10:491e10505bae added c
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	127	\| () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	128	\| x 9:7398f702a162 added c
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	129	\|/ () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	130	\| * 8:2ba73e31f264 added c
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	131	\|/ () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	132	\| * 7:f0f1694f123e added d
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	133	\| \| () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	134	\| \| x 6:9c1631e352d9 added d
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	135	\| \|/ () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	136	\| \| * 5:e49523854bc8 added d
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	137	\| \|/ () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	138	\| \| x 4:c41c793e0ef1 added d
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	139	\| \|/ () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	140	\| x 3:ca1b80f7960a added c
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	141	\|/ () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	142	o 2:b1661037fa25 added b
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	143	\| () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	144	o 1:c7586e2a9264 added a
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	145	\| () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	146	o 0:8fa14d15e168 added hgignore
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	147	() draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	148
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	149	$ hg evolve --all --content-divergent
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	150	merge:[8] added c
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	151	with: [10] added c
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	152	base: [3] added c
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	153	updating to "local" side of the conflict: 2ba73e31f264
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	154	merging "other" content-divergent changeset '491e10505bae'
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	155	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	156	nothing changed
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	157	merge:[5] added d
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	158	with: [7] added d
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	159	base: [4] added d
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	160	updating to "local" side of the conflict: e49523854bc8
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	161	merging "other" content-divergent changeset 'f0f1694f123e'
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	162	merging d
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	163	warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	164	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	165	abort: fix conflicts and run 'hg evolve --continue' or use 'hg update -C .' to abort
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	166	[255]
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	167
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	168	$ hg evolve --abort
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	169	evolve aborted
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	170	working directory is now at 491e10505bae
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	171
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	172	$ hg glog --hidden
3792 bb7d1616407f evolve: return the new node formed only as the replacement Pulkit Goyal <7895pulkit@gmail.com> parents: 3791 diff changeset	173	@ 10:491e10505bae added c
3791 63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	174	\| () draft
3792 bb7d1616407f evolve: return the new node formed only as the replacement Pulkit Goyal <7895pulkit@gmail.com> parents: 3791 diff changeset	175	\| x 9:7398f702a162 added c
bb7d1616407f evolve: return the new node formed only as the replacement Pulkit Goyal <7895pulkit@gmail.com> parents: 3791 diff changeset	176	\|/ () draft
bb7d1616407f evolve: return the new node formed only as the replacement Pulkit Goyal <7895pulkit@gmail.com> parents: 3791 diff changeset	177	\| o 8:2ba73e31f264 added c
3791 63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	178	\|/ () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	179	\| * 7:f0f1694f123e added d
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	180	\| \| () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	181	\| \| x 6:9c1631e352d9 added d
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	182	\| \|/ () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	183	\| \| * 5:e49523854bc8 added d
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	184	\| \|/ () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	185	\| \| x 4:c41c793e0ef1 added d
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	186	\| \|/ () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	187	\| x 3:ca1b80f7960a added c
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	188	\|/ () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	189	o 2:b1661037fa25 added b
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	190	\| () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	191	o 1:c7586e2a9264 added a
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	192	\| () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	193	o 0:8fa14d15e168 added hgignore
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	194	() draft
3792 bb7d1616407f evolve: return the new node formed only as the replacement Pulkit Goyal <7895pulkit@gmail.com> parents: 3791 diff changeset	195
bb7d1616407f evolve: return the new node formed only as the replacement Pulkit Goyal <7895pulkit@gmail.com> parents: 3791 diff changeset	196	XXX: we need to strip off the obsmarker created 10 -> 8
bb7d1616407f evolve: return the new node formed only as the replacement Pulkit Goyal <7895pulkit@gmail.com> parents: 3791 diff changeset	197	$ hg obslog -r . --all
bb7d1616407f evolve: return the new node formed only as the replacement Pulkit Goyal <7895pulkit@gmail.com> parents: 3791 diff changeset	198	o 2ba73e31f264 (8) added c
bb7d1616407f evolve: return the new node formed only as the replacement Pulkit Goyal <7895pulkit@gmail.com> parents: 3791 diff changeset	199	\|\
bb7d1616407f evolve: return the new node formed only as the replacement Pulkit Goyal <7895pulkit@gmail.com> parents: 3791 diff changeset	200	@ \| 491e10505bae (10) added c
bb7d1616407f evolve: return the new node formed only as the replacement Pulkit Goyal <7895pulkit@gmail.com> parents: 3791 diff changeset	201	\| \| rewritten as 2ba73e31f264 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
bb7d1616407f evolve: return the new node formed only as the replacement Pulkit Goyal <7895pulkit@gmail.com> parents: 3791 diff changeset	202	\| \|
bb7d1616407f evolve: return the new node formed only as the replacement Pulkit Goyal <7895pulkit@gmail.com> parents: 3791 diff changeset	203	x \| 7398f702a162 (9) added c
bb7d1616407f evolve: return the new node formed only as the replacement Pulkit Goyal <7895pulkit@gmail.com> parents: 3791 diff changeset	204	\|/ rewritten(content) as 491e10505bae using amend by test (Thu Jan 01 00:00:00 1970 +0000)
bb7d1616407f evolve: return the new node formed only as the replacement Pulkit Goyal <7895pulkit@gmail.com> parents: 3791 diff changeset	205	\|
bb7d1616407f evolve: return the new node formed only as the replacement Pulkit Goyal <7895pulkit@gmail.com> parents: 3791 diff changeset	206	x ca1b80f7960a (3) added c
bb7d1616407f evolve: return the new node formed only as the replacement Pulkit Goyal <7895pulkit@gmail.com> parents: 3791 diff changeset	207	rewritten(content) as 2ba73e31f264 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
bb7d1616407f evolve: return the new node formed only as the replacement Pulkit Goyal <7895pulkit@gmail.com> parents: 3791 diff changeset	208	rewritten(content) as 7398f702a162 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
bb7d1616407f evolve: return the new node formed only as the replacement Pulkit Goyal <7895pulkit@gmail.com> parents: 3791 diff changeset	209

author	Pulkit Goyal <7895pulkit@gmail.com>
	Thu, 24 May 2018 02:12:14 +0530
changeset 3792	bb7d1616407f
parent 3791	63d6d024dfb2
child 3832	fb821ed44f86
permissions	-rw-r--r--