tests/test-pull-update.out
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sun, 08 Aug 2010 22:49:01 +0200
changeset 11767 9b771b4ce2f3
parent 9611 a3d73b3e1f8a
permissions -rw-r--r--
mq/qqueue: --list does not print (active) with --quiet For scripting purposes, it can be convenient to get a simple listing of available queues, without indication of the active one. --quiet documentation change removed by Patrick Mézard.

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