mercurial: tests/test-merge-revert.t@b70628a9aa7e (annotated)

49621 55c6ebd11cb9 tests: run many tests in $TESTTMP/repo instead of $TESTTMP Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 12279 diff changeset	1	$ hg init repo
55c6ebd11cb9 tests: run many tests in $TESTTMP/repo instead of $TESTTMP Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 12279 diff changeset	2	$ cd repo
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	3
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	4	$ echo "added file1" > file1
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	5	$ echo "added file2" > file2
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	6	$ hg add file1 file2
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	7	$ hg commit -m "added file1 and file2"
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	8
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	9	$ echo "changed file1" >> file1
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	10	$ hg commit -m "changed file1"
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	11
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	12	$ hg -q log
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	13	1:08a16e8e4408
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	14	0:d29c767a4b52
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	15	$ hg id
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	16	08a16e8e4408 tip
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	17
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	18	$ hg update -C 0
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	19	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	20	$ hg id
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	21	d29c767a4b52
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	22	$ echo "changed file1" >> file1
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	23	$ hg id
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	24	d29c767a4b52+
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	25
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	26	$ hg revert --all
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	27	reverting file1
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	28	$ hg diff
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	29	$ hg status
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	30	? file1.orig
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	31	$ hg id
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	32	d29c767a4b52
792 49ec802b4a16 Added tests for bug with three-way-merging of old tip, tip and cwd. Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	33
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	34	$ hg update
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	35	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	36	$ hg diff
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	37	$ hg status
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	38	? file1.orig
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	39	$ hg id
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	40	08a16e8e4408 tip
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	41
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	42	$ hg update -C 0
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	43	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	44	$ echo "changed file1" >> file1
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	45
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	46	$ hg update
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	47	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	48	$ hg diff
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	49	$ hg status
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	50	? file1.orig
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	51	$ hg id
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	52	08a16e8e4408 tip
792 49ec802b4a16 Added tests for bug with three-way-merging of old tip, tip and cwd. Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	53
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	54	$ hg revert --all
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	55	$ hg diff
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	56	$ hg status
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	57	? file1.orig
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	58	$ hg id
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	59	08a16e8e4408 tip
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	60
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	61	$ hg revert -r tip --all
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	62	$ hg diff
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	63	$ hg status
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	64	? file1.orig
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	65	$ hg id
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	66	08a16e8e4408 tip
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	67
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	68	$ hg update -C
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	69	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	70	$ hg diff
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	71	$ hg status
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	72	? file1.orig
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	73	$ hg id
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	74	08a16e8e4408 tip
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	75

author	Pierre-Yves David <pierre-yves.david@octobus.net>
	Fri, 05 Apr 2024 11:33:47 +0200
changeset 51580	b70628a9aa7e
parent 49621	55c6ebd11cb9
permissions	-rw-r--r--