Mercurial > hg

view tests/test-mq-qclone-http.out @ 9954:d6a307719ccb stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix bug in prepush logic involving merge changesets When creating new branches and merging them into existing ones, you would sometimes be able to push some changesets (the existing branches) without using --force, even when that creates a new head on the remote. A test which triggers the error has been added.
author Sune Foldager <cryo@cyanite.org>
date Mon, 30 Nov 2009 14:58:52 +0100
parents a3d73b3e1f8a
children 400ffd5f2f14
line wrap: on
line source

adding a
adding b
[mq]: b.patch
a
b.patch
% test with recursive collection
200 Script output follows


/a/
/a/.hg/patches/

requesting all changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 3 changes to 3 files
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a
applying b.patch
now at: b.patch
imported patch b.patch
a
% test with normal collection
200 Script output follows


/a/
/a/.hg/patches/

requesting all changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 3 changes to 3 files
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a
applying b.patch
now at: b.patch
imported patch b.patch
a
% test with old-style collection
200 Script output follows


/a/
/a/.hg/patches/

requesting all changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 3 changes to 3 files
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a
applying b.patch
now at: b.patch
imported patch b.patch
a