view tests/test-demandimport.out @ 6297:fed1a9c22076

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.

os = <unloaded module 'os'>
os.system = <built-in function system>
os = <module 'os' from '?'>
mercurial.version = <unloaded module 'version'>
mercurial.version.get_version = <function get_version at 0x?>
mercurial.version = <module 'mercurial.version' from '?'>
mercurial = <module 'mercurial' from '?'>
util = <unloaded module 'util'>
util.system = <function system at 0x?>
util = <module 'mercurial.util' from '?'>
util.system = <function system at 0x?>
fred = <unloaded module 're'>
re = <unloaded module 'sys'>
fred = <unloaded module 're'>
fred.sub = <function sub at 0x?>
fred = <proxied module 're'>
re = <unloaded module 'sys'>
re.stdout = <open file '<stdout>', mode 'w' at 0x?>
re = <proxied module 'sys'>