mercurial: tests/test-merge5.t@718f28ea3af4 (annotated)

49621 55c6ebd11cb9 tests: run many tests in $TESTTMP/repo instead of $TESTTMP Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 45840 diff changeset	1	$ hg init repo
55c6ebd11cb9 tests: run many tests in $TESTTMP/repo instead of $TESTTMP Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 45840 diff changeset	2	$ cd repo
11978 ef4a1ffbf519 tests: unify test-merge5 Pradeepkumar Gayam <in3xes@gmail.com> parents: 6350 diff changeset	3	$ echo This is file a1 > a
ef4a1ffbf519 tests: unify test-merge5 Pradeepkumar Gayam <in3xes@gmail.com> parents: 6350 diff changeset	4	$ echo This is file b1 > b
ef4a1ffbf519 tests: unify test-merge5 Pradeepkumar Gayam <in3xes@gmail.com> parents: 6350 diff changeset	5	$ hg add a b
12155 94ad12aa0530 test-merge5: removed unnecessary parts of test Martin Geisler <mg@lazybytes.net> parents: 12154 diff changeset	6	$ hg commit -m "commit #0"
11978 ef4a1ffbf519 tests: unify test-merge5 Pradeepkumar Gayam <in3xes@gmail.com> parents: 6350 diff changeset	7	$ echo This is file b22 > b
12155 94ad12aa0530 test-merge5: removed unnecessary parts of test Martin Geisler <mg@lazybytes.net> parents: 12154 diff changeset	8	$ hg commit -m "comment #1"
11978 ef4a1ffbf519 tests: unify test-merge5 Pradeepkumar Gayam <in3xes@gmail.com> parents: 6350 diff changeset	9	$ hg update 0
ef4a1ffbf519 tests: unify test-merge5 Pradeepkumar Gayam <in3xes@gmail.com> parents: 6350 diff changeset	10	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
ef4a1ffbf519 tests: unify test-merge5 Pradeepkumar Gayam <in3xes@gmail.com> parents: 6350 diff changeset	11	$ rm b
12155 94ad12aa0530 test-merge5: removed unnecessary parts of test Martin Geisler <mg@lazybytes.net> parents: 12154 diff changeset	12	$ hg commit -A -m "comment #2"
11978 ef4a1ffbf519 tests: unify test-merge5 Pradeepkumar Gayam <in3xes@gmail.com> parents: 6350 diff changeset	13	removing b
ef4a1ffbf519 tests: unify test-merge5 Pradeepkumar Gayam <in3xes@gmail.com> parents: 6350 diff changeset	14	created new head
12154 c85e07a2d783 test-merge5: ensure updating to tip across branches is tested Brodie Rao <brodie@bitheap.org> parents: 11978 diff changeset	15	$ hg update 1
c85e07a2d783 test-merge5: ensure updating to tip across branches is tested Brodie Rao <brodie@bitheap.org> parents: 11978 diff changeset	16	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
17849 6da47b655d97 update: check for missing files with --check (issue3595) Matt Mackall <mpm@selenic.com> parents: 14485 diff changeset	17	$ rm b
28065 6b1fc09c699a update: change default destination to tipmost descendant (issue4673) (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28029 diff changeset	18	$ hg update -c 2
19801 41abe2e3e3b7 update: standardize error message for dirty update --check Siddharth Agarwal <sid0@fb.com> parents: 19799 diff changeset	19	abort: uncommitted changes
45840 527ce85c2e60 errors: introduce StateError and use it from commands and cmdutil Martin von Zweigbergk <martinvonz@google.com> parents: 28065 diff changeset	20	[20]
17849 6da47b655d97 update: check for missing files with --check (issue3595) Matt Mackall <mpm@selenic.com> parents: 14485 diff changeset	21	$ hg revert b
28065 6b1fc09c699a update: change default destination to tipmost descendant (issue4673) (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28029 diff changeset	22	$ hg update -c 2
12154 c85e07a2d783 test-merge5: ensure updating to tip across branches is tested Brodie Rao <brodie@bitheap.org> parents: 11978 diff changeset	23	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
11978 ef4a1ffbf519 tests: unify test-merge5 Pradeepkumar Gayam <in3xes@gmail.com> parents: 6350 diff changeset	24	$ mv a c
415 c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted mpm@selenic.com parents: diff changeset	25
12155 94ad12aa0530 test-merge5: removed unnecessary parts of test Martin Geisler <mg@lazybytes.net> parents: 12154 diff changeset	26	Should abort:
94ad12aa0530 test-merge5: removed unnecessary parts of test Martin Geisler <mg@lazybytes.net> parents: 12154 diff changeset	27
23026 fe80fdf68ba7 test-merge5: remove obsolete '-y' and its motivating comment Martin von Zweigbergk <martinvonz@gmail.com> parents: 19801 diff changeset	28	$ hg update 1
19799 ab3e42225dbc update: add error message for dirty non-linear update with no rev Siddharth Agarwal <sid0@fb.com> parents: 19798 diff changeset	29	abort: uncommitted changes
ab3e42225dbc update: add error message for dirty non-linear update with no rev Siddharth Agarwal <sid0@fb.com> parents: 19798 diff changeset	30	(commit or update --clean to discard changes)
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12155 diff changeset	31	[255]
11978 ef4a1ffbf519 tests: unify test-merge5 Pradeepkumar Gayam <in3xes@gmail.com> parents: 6350 diff changeset	32	$ mv c a
12155 94ad12aa0530 test-merge5: removed unnecessary parts of test Martin Geisler <mg@lazybytes.net> parents: 12154 diff changeset	33
94ad12aa0530 test-merge5: removed unnecessary parts of test Martin Geisler <mg@lazybytes.net> parents: 12154 diff changeset	34	Should succeed:
94ad12aa0530 test-merge5: removed unnecessary parts of test Martin Geisler <mg@lazybytes.net> parents: 12154 diff changeset	35
23026 fe80fdf68ba7 test-merge5: remove obsolete '-y' and its motivating comment Martin von Zweigbergk <martinvonz@gmail.com> parents: 19801 diff changeset	36	$ hg update 1
11978 ef4a1ffbf519 tests: unify test-merge5 Pradeepkumar Gayam <in3xes@gmail.com> parents: 6350 diff changeset	37	1 files updated, 0 files merged, 0 files removed, 0 files unresolved

author	Pierre-Yves David <pierre-yves.david@octobus.net>
	Thu, 07 Mar 2024 04:15:23 +0100
changeset 51536	718f28ea3af4
parent 49621	55c6ebd11cb9
permissions	-rw-r--r--