3 Commits

Author	SHA1	Message	Date
Alexis S. L. Carvalho	f5a37c37de	revert: update state of files in the "checkout" list ... This can make a difference when there are filters involved and decode(encode(working-dir-data)) != working-dir-data even though encode(decode(repo-data)) == repo-data An example is a working dir file that uses only \n when you're using the win32text extension.	2008-03-18 04:07:39 -03:00
Alexis S. L. Carvalho	dc7b734ee2	normallookup: during merges, restore the state saved by remove	2008-03-18 04:07:39 -03:00
Alexis S. L. Carvalho	cfe6940b56	dirstate.remove: during merges, remember the previous file state ... We encode the previous state as a negative file size (AFAICS, previous versions of hg always have size == 0 when state == 'r'). We save the state of 'm'erged and dirty files, because they're the two states that indicate that a file has to be committed on a merge to correctly record per-file history.	2008-03-18 04:07:39 -03:00