tests/test-pull-update.out
author Matt Mackall <mpm@selenic.com>
Thu, 26 Jun 2008 18:44:54 -0500
changeset 6757 55c71226eceb
parent 6338 0750f11152fe
child 9611 a3d73b3e1f8a
permissions -rw-r--r--
purge: cleanup - remove casefolding check, no longer needed - fold error function into remove - simplify eol logic - remove force logic and parameters

adding foo
updating working directory
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