Mercurial Mercurial > hg / file revision
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-issue619.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Wed, 20 May 2009 18:35:41 +0200
changeset 8530 03196ac9a8b9
parent 6375 cdc458b12f0f
child 11173 5b48d819d5f9
permissions -rw-r--r--
store: refactor the fncache handling put all the fncache file writing and reading in the same place.

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
Mercurial