Mercurial > hg

diff tests/test-add.t @ 18300:745bc16ccef2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
largefiles: fix update from a merge with removed files A situation with this case could happen after interrupting an update. Update would fail with: abort: No such file or directory: $TESTTMP/f/.hglf/sub2/large6 Update from a merge without using clean is not possible anyway, so this patch takes a step in the right direction so it gets as far as reporting the right error.
author Mads Kiilerich <madski@unity3d.com>
date Fri, 11 Jan 2013 16:30:29 +0100
parents 01ed5bb5cd41
children ba6486076429
line wrap: on
line diff