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

Revert almost all of 5be434785317; add a test...

Revert almost all of 5be434785317; add a test Because of file copies, we should update the manifest dict only after committing all files.

Matt Mackall - - Load All Authors

File last commit:

r3503:b28d3e0f default


                r3675:6990e499

default

Download file

             test-branch.out
        
                    61 lines
            
             | 1.8 KiB
            
                | text/plain
            
             |
                TextLexer

/ tests / test-branch.out

History | Source | Raw |Copy content |Copy permalink

Benoit Boissinot hg merge: fix lookup of branch...	r3071	adding a
		adding b
		2 files updated, 0 files merged, 0 files removed, 0 files unresolved
Matt Mackall Deprecate old --branch/branches options	r3503	the --branches option is deprecated, please use 'hg branches' instead
Benoit Boissinot hg merge: fix lookup of branch...	r3071	changeset: 0:b544c4ac4389
		user: test
		date: Mon Jan 12 13:46:40 1970 +0000
		summary: 0

Matt Mackall Deprecate old --branch/branches options	r3503	the --branch option is deprecated, please use 'hg branch' instead
Benoit Boissinot hg merge: fix lookup of branch...	r3071	Using head f4ac749470f2 for branch foo
		2 files updated, 0 files merged, 0 files removed, 0 files unresolved
		changeset: 1:f4ac749470f2
		tag: foo
		tag: tip
		user: test
		date: Mon Jan 12 13:46:40 1970 +0000
		summary: 1

		2 files updated, 0 files merged, 0 files removed, 0 files unresolved
		adding c
Matt Mackall Deprecate old --branch/branches options	r3503	the --branch option is deprecated, please use 'hg branch' instead
Benoit Boissinot hg merge: fix lookup of branch...	r3071	Using head f4ac749470f2 for branch foo
		2 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
Matt Mackall Deprecate old --branch/branches options	r3503	the --branches option is deprecated, please use 'hg branches' instead
Benoit Boissinot hg merge: fix lookup of branch...	r3071	changeset: 2:1505d56ee00e
		tag: tip
		parent: 0:b544c4ac4389
		user: test
		date: Mon Jan 12 13:46:40 1970 +0000
		summary: 0.0

		changeset: 1:f4ac749470f2
		tag: foo
		branch: foo
		user: test
		date: Mon Jan 12 13:46:40 1970 +0000
		summary: 1

		2 files updated, 0 files merged, 1 files removed, 0 files unresolved
		adding d
Matt Mackall Deprecate old --branch/branches options	r3503	the --branch option is deprecated, please use 'hg branch' instead
Benoit Boissinot hg merge: fix lookup of branch...	r3071	Using head f4ac749470f2 for branch foo
		2 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
Matt Mackall Deprecate old --branch/branches options	r3503	the --branches option is deprecated, please use 'hg branches' instead
Benoit Boissinot hg merge: fix lookup of branch...	r3071	changeset: 3:53b72df12ae5
		tag: tip
		parent: 0:b544c4ac4389
		user: test
		date: Mon Jan 12 13:46:40 1970 +0000
		summary: 0.0

		changeset: 1:f4ac749470f2
		tag: foo
		branch: foo
		user: test
		date: Mon Jan 12 13:46:40 1970 +0000
		summary: 1

	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