##// END OF EJS Templates
merge with stable
merge with stable

File last commit:

r12156:4c94b6d0 default
r12278:c4c2ba55 merge default
Show More
test-unrelated-pull.out
23 lines | 558 B | text/plain | TextLexer
/ tests / test-unrelated-pull.out
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)
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 1:9a79c33a9db3
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
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
mpm@selenic.com
Actually warn on pulling from an unrelated repository...
r579 summary: a
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 0:01f8062b2de5
mpm@selenic.com
Actually warn on pulling from an unrelated repository...
r579 user: b
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
mpm@selenic.com
Actually warn on pulling from an unrelated repository...
r579 summary: b