Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-issue619.out @ 5461:ab4d2e9f3b97

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: svn -- fix 'exists' Previously 'exists' erroneously returned False for empty dirictories. This is wrong since we want to detect even empty 'branches/' or 'tags/'.
author Kirill Smelkov <kirr@landau.phys.spbu.ru>
date Sat, 13 Oct 2007 15:22:03 +0400
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