Mercurial > hg

view tests/test-issue619.out @ 11844:6c51a5056020 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
http basic auth: reset redirect counter on new requests (issue2255) On Python 2.6.6 (and patched 2.6.5 on certain Linux distros), the change that caused issue2255 was also applied to non-digest authentication; this change extends the 2ec346160783 fix accordingly.
author Wagner Bruna <wbruna@softwareexpress.com.br>
date Fri, 13 Aug 2010 13:32:05 -0300
parents 6f1d1ed3e19a
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: merging with a working directory ancestor has no effect
done