upstream/mercurial-mirror Files · tests/test-rename-merge1.out

add -r/--rev and --base option to bundle...

add -r/--rev and --base option to bundle --rev is used to specify a target rev (like pull or clone) --base REV is used to specify a base instead of a target repo the target repo is assumed to have all the rev specified in --base

Matt Mackall - - Load All Authors

File last commit:

r3252:ae85272b default


                r3284:d89e9884

default

Download file

             test-rename-merge1.out
        
                    22 lines
            
             | 532 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-rename-merge1.out

History | Source | Raw |Copy content |Copy permalink

Matt Mackall Add core copy detection algorithm...	r3153	checkout
		2 files updated, 0 files merged, 2 files removed, 0 files unresolved
		merge
		resolving manifests
		overwrite None branchmerge True partial False
		ancestor f26ec4fc3fa3 local 8e765a822af2 remote af1939970a1c
Matt Mackall merge: fixes for merge+rename...	r3251	a: remote moved -> c
Matt Mackall Add core copy detection algorithm...	r3153	b2: remote created -> g
Matt Mackall merge: copy fixes and tests...	r3252	merging a and b to b
Matt Mackall merge: fixes for merge+rename...	r3251	resolving a
		my a@f26ec4fc3fa3 other b@8e765a822af2 ancestor a@af1939970a1c
		copying a to b
		removing a
Matt Mackall Add core copy detection algorithm...	r3153	getting b2
Matt Mackall merge: fixes for merge+rename...	r3251	1 files updated, 1 files merged, 0 files removed, 0 files unresolved
Matt Mackall Add core copy detection algorithm...	r3153	(branch merge, don't forget to commit)
Matt Mackall merge: fixes for merge+rename...	r3251	M b
		a
		M b2
		R a
		C c2
Matt Mackall Add core copy detection algorithm...	r3153	blahblah

	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