Differential D10518 Diff 27194 tests/test-branch-change.t

Changeset View

Standalone View

tests/test-branch-change.t

	Show First 20 Lines • Show All 144 Lines • ▼ Show 20 Line(s)
	Changing branch of an obsoleted changeset			Changing branch of an obsoleted changeset

	$ hg branch -r 4 foobar			$ hg branch -r 4 foobar
	abort: hidden revision '4' was rewritten as: 7c1991464886			abort: hidden revision '4' was rewritten as: 7c1991464886
	(use --hidden to access hidden revisions)			(use --hidden to access hidden revisions)
	[255]			[255]

	$ hg branch -r 4 --hidden foobar			$ hg branch -r 4 --hidden foobar
	abort: cannot change branch of a obsolete changeset			abort: cannot change branch of 3938acfb5c0f, as that creates content-divergence with 7c1991464886
				(add --verbose for details)
				pulkitUnsubmitted Not Done Reply `s/of of/ of` pulkit: `s/of of/ of`
				martinvonzAuthorUnsubmitted Done Reply Good catch. The bug was actually already there: we sometimes would say "cannot change branch of while merging". It's a consequence of the simplistic way we produce these messages. We simply insert something that should be a verb into a sentence. I assume that's also not great for i18n. I suppose we could change the "verb" from "change branch of" to "branch-change", so it becomes these: "cannot branch-change the null revision" "cannot branch-change while merging" "cannot branch-change public changesets" "cannot branch-change changeset with children" "branch-change of 3938acfb5c0f creates content-divergence with 7c1991464886'" But it's probably better to change the messages to fit better. In "cannot change branch of the null revision" "cannot change branch of changeset while merging" (added "changeset") "cannot change branch of public changesets" "cannot change branch of changeset with children" "cannot change branch of 3938acfb5c0f, as that creates content-divergence with 7c1991464886'" I'll do the latter. martinvonz: Good catch. The bug was actually already there: we sometimes would say "cannot change branch of…
	[10]			[10]

	Make sure bookmark movement is correct			Make sure bookmark movement is correct

	$ hg bookmark b1			$ hg bookmark b1
	$ hg glog -r '.^::'			$ hg glog -r '.^::'
	@ 6:7c1991464886 Added e			@ 6:7c1991464886 Added e
	\| bar (b1)			\| bar (b1)
	▲ Show 20 Lines • Show All 271 Lines • Show Last 20 Lines