Mercurial > hg-stable

view tests/test-revlog-group-emptyiter.out @ 10251:a19d2993385d stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: fix merging of already merged subrepos (issue1986) This fixes a bug seen when merging a main repo which contains a subrepo when both repos have been merged before. Each repo (main and sub) has two branches, both of which have been merged before. In a subrepo, if the revision to merge to is an ancestor of the current rev, then the merge should be a noop. Test provided by Steve Losh.
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 15 Jan 2010 21:08:04 +0100
parents a3d73b3e1f8a
children
line wrap: on
line source

# -- setting up base repo
adding a
# -- cloning base repo
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
# -- setting up cset to push
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
adding a
created new head
# -- pushing
pushing to ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)