upstream/mercurial-mirror Files · tests/test-newbranch.out

Fix for Issue1260

Dirkjan Ochtman - - Load All Authors

File last commit:

r6723:1fe6f365 default


                r6988:907e4e9b

default

Download file

             test-newbranch.out
        
                    172 lines
            
             | 4.9 KiB
            
                | text/plain
            
             |
                TextLexer

/ tests / test-newbranch.out

History | Source | Raw |Copy content |Copy permalink

Brendan Cully Fix up tests for new branch message	r4602	marked working directory as branch foo
Matt Mackall add branch and branches commands	r3502	foo
Brendan Cully Fix up tests for new branch message	r4602	marked working directory as branch bar
Brendan Cully Add test for branch shadowing	r4203	% branch shadowing
		abort: a branch of the same name already exists (use --force to override)
Brendan Cully Fix up tests for new branch message	r4602	marked working directory as branch default
Matt Mackall Add some basic branch name tests	r3420	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
		foo
Dirkjan Ochtman warn about new heads on commit (issue842)	r6336	created new head
Matt Mackall Add some basic branch name tests	r3420	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		foo
Alexis S. L. Carvalho small fixes for test-newbranch...	r3760	changeset: 5:5f8fb06e083e
Matt Mackall Add some basic branch name tests	r3420	branch: foo
		tag: tip
Alexis S. L. Carvalho small fixes for test-newbranch...	r3760	parent: 4:4909a3732169
		parent: 3:bf1bc2f45e83
Matt Mackall Add some basic branch name tests	r3420	user: test
Alexis S. L. Carvalho small fixes for test-newbranch...	r3760	date: Mon Jan 12 13:46:40 1970 +0000
Matt Mackall Add some basic branch name tests	r3420	summary: merge

Alexis S. L. Carvalho small fixes for test-newbranch...	r3760	changeset: 4:4909a3732169
Matt Mackall Add some basic branch name tests	r3420	branch: foo
Alexis S. L. Carvalho small fixes for test-newbranch...	r3760	parent: 1:b699b1cec9c2
Matt Mackall Add some basic branch name tests	r3420	user: test
Alexis S. L. Carvalho small fixes for test-newbranch...	r3760	date: Mon Jan 12 13:46:40 1970 +0000
Matt Mackall Add some basic branch name tests	r3420	summary: modify a branch

Alexis S. L. Carvalho small fixes for test-newbranch...	r3760	changeset: 3:bf1bc2f45e83
Matt Mackall Add some basic branch name tests	r3420	user: test
Alexis S. L. Carvalho small fixes for test-newbranch...	r3760	date: Mon Jan 12 13:46:40 1970 +0000
Matt Mackall Add some basic branch name tests	r3420	summary: clear branch name

Alexis S. L. Carvalho small fixes for test-newbranch...	r3760	changeset: 2:67ec16bde7f1
Matt Mackall Add some basic branch name tests	r3420	branch: bar
		user: test
Alexis S. L. Carvalho small fixes for test-newbranch...	r3760	date: Mon Jan 12 13:46:40 1970 +0000
Matt Mackall Add some basic branch name tests	r3420	summary: change branch name

Alexis S. L. Carvalho small fixes for test-newbranch...	r3760	changeset: 1:b699b1cec9c2
Matt Mackall Add some basic branch name tests	r3420	branch: foo
		user: test
Alexis S. L. Carvalho small fixes for test-newbranch...	r3760	date: Mon Jan 12 13:46:40 1970 +0000
Matt Mackall Add some basic branch name tests	r3420	summary: add branch name

Alexis S. L. Carvalho small fixes for test-newbranch...	r3760	changeset: 0:be8523e69bf8
Matt Mackall Add some basic branch name tests	r3420	user: test
Alexis S. L. Carvalho small fixes for test-newbranch...	r3760	date: Mon Jan 12 13:46:40 1970 +0000
Matt Mackall Add some basic branch name tests	r3420	summary: initial

Alexis S. L. Carvalho small fixes for test-newbranch...	r3760	foo 5:5f8fb06e083e
Eric Hopper Change branches to sort 'active' branches first, and add an option to show only active branches.	r4675	default 3:bf1bc2f45e83 (inactive)
		bar 2:67ec16bde7f1 (inactive)
Matt Mackall add branch and branches commands	r3502	foo
Alexis S. L. Carvalho "default" is the default branch name	r4176	default
Matt Mackall add branch and branches commands	r3502	bar
Thomas Arendsen Hein Add test for invalid branch cache (fixed by 27ebe4efe98e)	r3451	% test for invalid branch cache
		rolling back last transaction
Alexis S. L. Carvalho small fixes for test-newbranch...	r3760	changeset: 4:4909a3732169
Thomas Arendsen Hein Add test for invalid branch cache (fixed by 27ebe4efe98e)	r3451	branch: foo
		tag: tip
Alexis S. L. Carvalho small fixes for test-newbranch...	r3760	parent: 1:b699b1cec9c2
Thomas Arendsen Hein Add test for invalid branch cache (fixed by 27ebe4efe98e)	r3451	user: test
Alexis S. L. Carvalho small fixes for test-newbranch...	r3760	date: Mon Jan 12 13:46:40 1970 +0000
Thomas Arendsen Hein Add test for invalid branch cache (fixed by 27ebe4efe98e)	r3451	summary: modify a branch

Thomas Arendsen Hein Print less scary warning when invalidating the branch cache.	r6056	invalidating branch cache (tip differs)
Alexis S. L. Carvalho Ignore all errors while parsing the branch cache.	r3761	changeset: 4:4909a3732169c0c20011c4f4b8fdff4e3d89b23f
		branch: foo
		tag: tip
		parent: 1:b699b1cec9c2966b3700de4fef0dc123cd754c31
		parent: -1:0000000000000000000000000000000000000000
		manifest: 4:d01b250baaa05909152f7ae07d7a649deea0df9a
		user: test
		date: Mon Jan 12 13:46:40 1970 +0000
		files: a
		extra: branch=foo
		description:
		modify a branch


		4:4909a3732169
		4909a3732169c0c20011c4f4b8fdff4e3d89b23f 4
Alexis S. L. Carvalho "default" is the default branch name	r4176	bf1bc2f45e834c75404d0ddab57d53beab56e2f8 default
Alexis S. L. Carvalho Ignore all errors while parsing the branch cache.	r3761	4909a3732169c0c20011c4f4b8fdff4e3d89b23f foo
		67ec16bde7f1575d523313b9bca000f6a6f12dca bar
Alexis S. L. Carvalho update the branch cache at the end of addchangegroup...	r5988	% push should update the branch cache
		% pushing just rev 0
		be8523e69bf892e25817fc97187516b3c0804ae4 0
		be8523e69bf892e25817fc97187516b3c0804ae4 default
		% pushing everything
		4909a3732169c0c20011c4f4b8fdff4e3d89b23f 4
		bf1bc2f45e834c75404d0ddab57d53beab56e2f8 default
		4909a3732169c0c20011c4f4b8fdff4e3d89b23f foo
		67ec16bde7f1575d523313b9bca000f6a6f12dca bar
Brendan Cully Test update to branch tip	r4175	% update with no arguments: tipmost revision of the current branch
		bf1bc2f45e83
		4909a3732169 (foo) tip
Brendan Cully Fix up tests for new branch message	r4602	marked working directory as branch foobar
Alexis S. L. Carvalho avoid a traceback with hg branch newbranch; hg up	r4231	abort: branch foobar not found
Brendan Cully Add fast-forward branch merging	r4410	% fastforward merge
Brendan Cully Fix up tests for new branch message	r4602	marked working directory as branch ff
Brendan Cully Add fast-forward branch merging	r4410	adding ff
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		foo
Brendan Cully Make fast-forward merges full merges	r4623	changeset: 6:f0c74f92a385
Brendan Cully Add fast-forward branch merging	r4410	branch: foo
		tag: tip
Brendan Cully Make fast-forward merges full merges	r4623	parent: 4:4909a3732169
		parent: 5:c420d2121b71
Brendan Cully Add fast-forward branch merging	r4410	user: test
		date: Mon Jan 12 13:46:40 1970 +0000
		summary: Merge ff into foo

		a
		ff
Dirkjan Ochtman merge: only in-branch merges can be implicit	r6723	% test merging, add 3 default heads and one test head
		adding a
		adding b
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		adding c
		created new head
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		adding d
		created new head
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		marked working directory as branch test
		adding e
		created new head
		changeset: 4:3a1e01ed1df4
		branch: test
		tag: tip
		parent: 0:cb9a9f314b8b
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: e

		changeset: 3:980f7dc84c29
		parent: 0:cb9a9f314b8b
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: d

		changeset: 2:d36c0562f908
		parent: 0:cb9a9f314b8b
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: c

		changeset: 1:d2ae7f538514
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: b

		changeset: 0:cb9a9f314b8b
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: a

		% implicit merge with test branch as parent
		abort: branch 'test' has one head - please merge with an explicit rev
		1 files updated, 0 files merged, 1 files removed, 0 files unresolved
		% implicit merge with default branch as parent
		abort: branch 'default' has 3 heads - please merge with an explicit rev
		% 3 branch heads, explicit merge required
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		% 2 branch heads, implicit merge works
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages