upstream/mercurial-mirror Files · tests/test-unrelated-pull.out

convert/bzr: make it work with filemaps (issue1631)...

convert/bzr: make it work with filemaps (issue1631) The bzr converter maintains a child -> parents mapping and drop entries whenever a child is read. It does not work with filemaps, getchangedfiles() may be called more than once when filtered files belong to merge revisions. getchanges() still works that way but it is not clear whether a similar issue can arise when interacting with merges.

Matt Mackall - - Load All Authors

File last commit:

r3619:8c4fd0de default


                r8165:78658990

default

Download file

             test-unrelated-pull.out
        
                    23 lines
            
             | 558 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-unrelated-pull.out

History | Source | Raw |Copy content |Copy permalink

mpm@selenic.com Actually warn on pulling from an unrelated repository...	r579	pulling from ../a
		searching for changes
Vadim Gelfer update test for unrelated repo.	r1960	abort: repository is unrelated
		pulling from ../a
		searching for changes
		warning: repository is unrelated
mpm@selenic.com Actually warn on pulling from an unrelated repository...	r579	adding changesets
		adding manifests
mpm@selenic.com Fix up test results...	r775	adding file changes
mpm@selenic.com Update tests	r1043	added 1 changesets with 1 changes to 1 files (+1 heads)
Vadim Gelfer add merge command. means same thing as "update -m"....	r2019	(run 'hg heads' to see heads, 'hg merge' to merge)
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	changeset: 1:bdcee5d51fa6
mpm@selenic.com Actually warn on pulling from an unrelated repository...	r579	tag: tip
Matt Mackall Fix up parent display in logging...	r3619	parent: -1:000000000000
mpm@selenic.com Actually warn on pulling from an unrelated repository...	r579	user: a
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	date: Mon Jan 12 13:46:40 1970 +0000
mpm@selenic.com Actually warn on pulling from an unrelated repository...	r579	summary: a

Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	changeset: 0:f155ba1aa5ba
mpm@selenic.com Actually warn on pulling from an unrelated repository...	r579	user: b
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	date: Mon Jan 12 13:46:40 1970 +0000
mpm@selenic.com Actually warn on pulling from an unrelated repository...	r579	summary: b

	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