Mercurial > hg

view tests/test-issue619.out @ 10273:e898bc7810ad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: handle svn externals and meta changes (issue1982) - Detect changes to meta on regular and external entries - Do not try to commit external entries
author Patrick Mezard <pmezard@gmail.com>
date Thu, 21 Jan 2010 13:26:26 +0100
parents cdc458b12f0f
children 5b48d819d5f9
line wrap: on
line source

adding a
marked working directory as branch b
adding b
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
fast-forward
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
bogus fast-forward should fail
abort: can't merge with ancestor
done