mercurial: tests/test-update-reverse.t@4f36738a869a (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
44724 5c2a4f37eace tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems Joerg Sonnenberger <joerg@bec.de> parents: 25125 diff changeset	15	$ ls -A
5c2a4f37eace tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems Joerg Sonnenberger <joerg@bec.de> parents: 25125 diff changeset	16	.hg
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	17	a
1236 67a28636ea64 Fix bug with co -C across branches, update tests mpm@selenic.com parents: diff changeset	18
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	19	$ touch side1
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	20	$ hg add side1
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	21	$ hg commit -m "Added side1"
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	22	created new head
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	23	$ touch side2
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	24	$ hg add side2
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	25	$ hg commit -m "Added side2"
1236 67a28636ea64 Fix bug with co -C across branches, update tests mpm@selenic.com parents: diff changeset	26
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	27	$ hg log
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	28	changeset: 3:91ebc10ed028
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	29	tag: tip
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	30	user: test
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	31	date: Thu Jan 01 00:00:00 1970 +0000
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	32	summary: Added side2
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	33
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	34	changeset: 2:b932d7dbb1e1
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	35	parent: 0:c2eda428b523
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	36	user: test
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	37	date: Thu Jan 01 00:00:00 1970 +0000
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	38	summary: Added side1
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	39
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	40	changeset: 1:71a760306caf
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	41	user: test
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	42	date: Thu Jan 01 00:00:00 1970 +0000
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	43	summary: Added main
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	44
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	45	changeset: 0:c2eda428b523
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	46	user: test
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	47	date: Thu Jan 01 00:00:00 1970 +0000
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	48	summary: Added a
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	49
1236 67a28636ea64 Fix bug with co -C across branches, update tests mpm@selenic.com parents: diff changeset	50
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	51	$ hg heads
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	52	changeset: 3:91ebc10ed028
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	53	tag: tip
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	54	user: test
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	55	date: Thu Jan 01 00:00:00 1970 +0000
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	56	summary: Added side2
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	57
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	58	changeset: 1:71a760306caf
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	59	user: test
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	60	date: Thu Jan 01 00:00:00 1970 +0000
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	61	summary: Added main
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	62
44724 5c2a4f37eace tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems Joerg Sonnenberger <joerg@bec.de> parents: 25125 diff changeset	63	$ ls -A
5c2a4f37eace tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems Joerg Sonnenberger <joerg@bec.de> parents: 25125 diff changeset	64	.hg
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	65	a
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	66	side1
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	67	side2
1236 67a28636ea64 Fix bug with co -C across branches, update tests mpm@selenic.com parents: diff changeset	68
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	69	$ hg update --debug -C 1
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	70	resolving manifests
18605 bcf29565d89f manifestmerge: pass in branchmerge and force separately Siddharth Agarwal <sid0@fb.com> parents: 18360 diff changeset	71	branchmerge: False, force: True, partial: False
15625 efdcce3fd2d5 merge: make debug output easier to read Martin Geisler <mg@aragost.com> parents: 12279 diff changeset	72	ancestor: 91ebc10ed028+, local: 91ebc10ed028+, remote: 71a760306caf
18360 760c0d67ce5e merge: process files in sorted order Mads Kiilerich <mads@kiilerich.com> parents: 15625 diff changeset	73	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	74	removing side1
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	75	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	76	removing side2
21391 cb15835456cb merge: change debug logging - test output changes but no real changes Mads Kiilerich <madski@unity3d.com> parents: 19095 diff changeset	77	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	78	getting main
12279 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
44724 5c2a4f37eace tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems Joerg Sonnenberger <joerg@bec.de> parents: 25125 diff changeset	81	$ ls -A
5c2a4f37eace tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems Joerg Sonnenberger <joerg@bec.de> parents: 25125 diff changeset	82	.hg
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	83	a
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	84	main
1236 67a28636ea64 Fix bug with co -C across branches, update tests mpm@selenic.com parents: diff changeset	85

author	pacien <pacien.trangirard@pacien.net>
	Thu, 22 Sep 2022 16:09:53 +0200
changeset 49499	4f36738a869a
parent 44724	5c2a4f37eace
child 49621	55c6ebd11cb9
permissions	-rw-r--r--