Mercurial > hg

view tests/test-pull-update.out @ 9040:4743d1a65dfe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test: fix for compatibilty with true Bourne /bin/sh 'export foo=bar' is an extension, replaced with 'foo=bar; export foo'
author David Champion <dgc@uchicago.edu>
date Sun, 05 Jul 2009 13:58:37 -0500
parents 0750f11152fe
children a3d73b3e1f8a
line wrap: on
line source

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