Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-issue619.out @ 5408:36794dbe66a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Test workingctx exec/link bit for copies. Also, make the test runnable on platforms without symlinks.
author Patrick Mezard <pmezard@gmail.com>
date Sun, 07 Oct 2007 15:13:50 +0200
parents 8808ea7da86b
children
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: there is nothing to merge, just use 'hg update' or look at 'hg heads'
done