##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Merge with stable
Merge with stable
Adrian Buehlmann - - Load All Authors

File last commit:

r9611:a3d73b3e default
r10276:6109a02c merge default
Show More
test-pull-update.out
32 lines | 967 B | text/plain | TextLexer
/ tests / test-pull-update.out
History | Annotation | Raw |Copy content |Copy permalink
adding foo
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% should fail
pulling from ../tt
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
not updating, since new heads added
(run 'hg heads' to see heads, 'hg merge' to merge)
% should fail
pulling from ../t
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
not updating, since new heads added
(run 'hg heads' to see heads, 'hg merge' to merge)
merging foo
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% should work
pulling from ../tt
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (-1 heads)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved