Mercurial > hg
view tests/test-filelog.py.out @ 24709:69154e0ae384
strip: properly clear resolve state with --keep (issue4593)
Normal updates automatically clean up the resolve state, but strip
--keep does a "manual" update that bypasses the normal machinery. This
adds a mergestate reset.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 13 Apr 2015 07:42:25 -0500 |
parents | d76ba2090e0c |
children |
line wrap: on
line source
ERROR: FIXME: This is a known failure of filelog.size for data starting with \1\n OK.