mercurial: tests/test-issue619.t@f85f23f1479b (annotated)

26420 2fc86d92c4a9 urls: bulk-change BTS urls to new location Matt Mackall <mpm@selenic.com> parents: 23413 diff changeset	1	https://bz.mercurial-scm.org/619
12195 ee41be2bbf5a tests: unify test-issue* Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	2
49621 55c6ebd11cb9 tests: run many tests in $TESTTMP/repo instead of $TESTTMP Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 26420 diff changeset	3	$ hg init repo
55c6ebd11cb9 tests: run many tests in $TESTTMP/repo instead of $TESTTMP Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 26420 diff changeset	4	$ cd repo
12195 ee41be2bbf5a tests: unify test-issue* Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	5	$ echo a > a
ee41be2bbf5a tests: unify test-issue* Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	6	$ hg ci -Ama
ee41be2bbf5a tests: unify test-issue* Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	7	adding a
ee41be2bbf5a tests: unify test-issue* Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	8
ee41be2bbf5a tests: unify test-issue* Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	9	$ echo b > b
ee41be2bbf5a tests: unify test-issue* Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	10	$ hg branch b
ee41be2bbf5a tests: unify test-issue* Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	11	marked working directory as branch b
15615 41885892796e branch: warn on branching Matt Mackall <mpm@selenic.com> parents: 13550 diff changeset	12	(branches are permanent and global, did you want a bookmark?)
12195 ee41be2bbf5a tests: unify test-issue* Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	13	$ hg ci -Amb
ee41be2bbf5a tests: unify test-issue* Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	14	adding b
4748 8808ea7da86b merge: make test for fast-forward merge stricter (issue619) Matt Mackall <mpm@selenic.com> parents: diff changeset	15
12195 ee41be2bbf5a tests: unify test-issue* Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	16	$ hg co -C 0
ee41be2bbf5a tests: unify test-issue* Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	17	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
ee41be2bbf5a tests: unify test-issue* Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	18
ee41be2bbf5a tests: unify test-issue* Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	19	Fast-forward:
4748 8808ea7da86b merge: make test for fast-forward merge stricter (issue619) Matt Mackall <mpm@selenic.com> parents: diff changeset	20
12195 ee41be2bbf5a tests: unify test-issue* Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	21	$ hg merge b
ee41be2bbf5a tests: unify test-issue* Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	22	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
ee41be2bbf5a tests: unify test-issue* Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	23	(branch merge, don't forget to commit)
ee41be2bbf5a tests: unify test-issue* Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	24	$ hg ci -Ammerge
4748 8808ea7da86b merge: make test for fast-forward merge stricter (issue619) Matt Mackall <mpm@selenic.com> parents: diff changeset	25
12195 ee41be2bbf5a tests: unify test-issue* Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	26	Bogus fast-forward should fail:
4748 8808ea7da86b merge: make test for fast-forward merge stricter (issue619) Matt Mackall <mpm@selenic.com> parents: diff changeset	27
12195 ee41be2bbf5a tests: unify test-issue* Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	28	$ hg merge b
ee41be2bbf5a tests: unify test-issue* Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	29	abort: merging with a working directory ancestor has no effect
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12195 diff changeset	30	[255]
12195 ee41be2bbf5a tests: unify test-issue* Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	31
23413 0c432696dae3 revset: fix first and last for generatorset (issue4465) Pierre-Yves David <pierre-yves.david@fb.com> parents: 15615 diff changeset	32	Even with strange revset (issue4465)
0c432696dae3 revset: fix first and last for generatorset (issue4465) Pierre-Yves David <pierre-yves.david@fb.com> parents: 15615 diff changeset	33
0c432696dae3 revset: fix first and last for generatorset (issue4465) Pierre-Yves David <pierre-yves.david@fb.com> parents: 15615 diff changeset	34	$ hg merge ::.
0c432696dae3 revset: fix first and last for generatorset (issue4465) Pierre-Yves David <pierre-yves.david@fb.com> parents: 15615 diff changeset	35	abort: merging with a working directory ancestor has no effect
0c432696dae3 revset: fix first and last for generatorset (issue4465) Pierre-Yves David <pierre-yves.david@fb.com> parents: 15615 diff changeset	36	[255]
0c432696dae3 revset: fix first and last for generatorset (issue4465) Pierre-Yves David <pierre-yves.david@fb.com> parents: 15615 diff changeset	37

author	Pierre-Yves David <pierre-yves.david@octobus.net>
	Thu, 07 Mar 2024 10:55:22 +0100
changeset 51531	f85f23f1479b
parent 49621	55c6ebd11cb9
permissions	-rw-r--r--