mercurial: tests/test-update-reverse.t@3178e4989202 (annotated)

12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	1	$ hg init
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	2
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	3	$ touch a
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	4	$ hg add a
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	5	$ hg commit -m "Added a"
1236 67a28636ea64 Fix bug with co -C across branches, update tests mpm@selenic.com parents: diff changeset	6
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	7	$ touch main
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	8	$ hg add main
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	9	$ hg commit -m "Added main"
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	10	$ hg checkout 0
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	11	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1236 67a28636ea64 Fix bug with co -C across branches, update tests mpm@selenic.com parents: diff changeset	12
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	13	'main' should be gone:
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	14
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	15	$ ls
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	16	a
1236 67a28636ea64 Fix bug with co -C across branches, update tests mpm@selenic.com parents: diff changeset	17
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	18	$ touch side1
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	19	$ hg add side1
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	20	$ hg commit -m "Added side1"
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	21	created new head
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	22	$ touch side2
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	23	$ hg add side2
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	24	$ hg commit -m "Added side2"
1236 67a28636ea64 Fix bug with co -C across branches, update tests mpm@selenic.com parents: diff changeset	25
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	26	$ hg log
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	27	changeset: 3:91ebc10ed028
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	28	tag: tip
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	29	user: test
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	30	date: Thu Jan 01 00:00:00 1970 +0000
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	31	summary: Added side2
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	32
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	33	changeset: 2:b932d7dbb1e1
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	34	parent: 0:c2eda428b523
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	35	user: test
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	36	date: Thu Jan 01 00:00:00 1970 +0000
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	37	summary: Added side1
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	38
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	39	changeset: 1:71a760306caf
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	40	user: test
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	41	date: Thu Jan 01 00:00:00 1970 +0000
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	42	summary: Added main
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	43
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	44	changeset: 0:c2eda428b523
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	45	user: test
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	46	date: Thu Jan 01 00:00:00 1970 +0000
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	47	summary: Added a
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	48
1236 67a28636ea64 Fix bug with co -C across branches, update tests mpm@selenic.com parents: diff changeset	49
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	50	$ hg heads
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	51	changeset: 3:91ebc10ed028
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	52	tag: tip
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	53	user: test
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	54	date: Thu Jan 01 00:00:00 1970 +0000
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	55	summary: Added side2
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	56
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	57	changeset: 1:71a760306caf
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	58	user: test
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	59	date: Thu Jan 01 00:00:00 1970 +0000
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	60	summary: Added main
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	61
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	62	$ ls
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	63	a
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	64	side1
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	65	side2
1236 67a28636ea64 Fix bug with co -C across branches, update tests mpm@selenic.com parents: diff changeset	66
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	67	$ hg update --debug -C 1
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	68	resolving manifests
18605 bcf29565d89f manifestmerge: pass in branchmerge and force separately Siddharth Agarwal <sid0@fb.com> parents: 18360 diff changeset	69	branchmerge: False, force: True, partial: False
15625 efdcce3fd2d5 merge: make debug output easier to read Martin Geisler <mg@aragost.com> parents: 12279 diff changeset	70	ancestor: 91ebc10ed028+, local: 91ebc10ed028+, remote: 71a760306caf
18360 760c0d67ce5e merge: process files in sorted order Mads Kiilerich <mads@kiilerich.com> parents: 15625 diff changeset	71	side1: other deleted -> r
21391 cb15835456cb merge: change debug logging - test output changes but no real changes Mads Kiilerich <madski@unity3d.com> parents: 19095 diff changeset	72	removing side1
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	73	side2: other deleted -> r
18631 e2dc5397bc82 tests: update test output (will be folded into parent) Bryan O'Sullivan <bryano@fb.com> parents: 18605 diff changeset	74	removing side2
19095 5cc71484ee9c merge: increase safety of parallel updating/removing on icasefs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18634 diff changeset	75	updating: side2 2/3 files (66.67%)
21391 cb15835456cb merge: change debug logging - test output changes but no real changes Mads Kiilerich <madski@unity3d.com> parents: 19095 diff changeset	76	main: remote created -> g
18631 e2dc5397bc82 tests: update test output (will be folded into parent) Bryan O'Sullivan <bryano@fb.com> parents: 18605 diff changeset	77	getting main
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	78	updating: main 3/3 files (100.00%)
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	79	1 files updated, 0 files merged, 2 files removed, 0 files unresolved
1236 67a28636ea64 Fix bug with co -C across branches, update tests mpm@selenic.com parents: diff changeset	80
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	81	$ ls
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	82	a
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	83	main
1236 67a28636ea64 Fix bug with co -C across branches, update tests mpm@selenic.com parents: diff changeset	84

author	Pierre-Yves David <pierre-yves.david@fb.com>
	Fri, 01 Aug 2014 13:01:35 -0700
branch	stable
changeset 21973	3178e4989202
parent 21391	cb15835456cb
child 25125	bd625cd4e5e7
permissions	-rw-r--r--