comparison .hgtags @ 15399:41453d55b481 stable 2.0

dirstate: don't fail when dropping a not-tracked file (issue3080) Complex merges with divergent renames can cause a file to be 'moved' twice, causing dirstate.drop() to be called twice. Rather than try to ensure there are no unexpected corner cases where this can happen, we simply ignore drops of files that aren't tracked.
author Matt Mackall <mpm@selenic.com>
date Tue, 01 Nov 2011 15:19:37 -0500
parents 52bc0c4daaf9
children c23737b76030
comparison
equal deleted inserted replaced
15398:474279be5add 15399:41453d55b481