Mercurial > hg
view tests/test-filecache.py.out @ 19986:ea81f8b2364e stable
rebase: fix working copy location after a --collapse (issue4080)
Rebasing with --collapse would leave the working copy on the parent of the
collapsed commit, instead of on the collapsed commit. This fixes that. Also
fixes a few tests that already covered this area but had bad data.
This also fixes issue3716 where bookmarks are not kept across rebases with
--collapse. I updated the test to cover that case as well.
author | Durham Goode <durham@fb.com> |
---|---|
date | Fri, 01 Nov 2013 17:08:06 -0700 |
parents | f36375576ed5 |
children | ed80cecdfc57 |
line wrap: on
line source
basic: creating creating creating creating fakeuncacheable: creating creating creating creating creating creating repository tip rolled back to revision -1 (undo commit) working directory now based on revision -1 repository tip rolled back to revision -1 (undo commit) working directory now based on revision -1 setbeforeget: 0 creating None