Mercurial > hg
view templates/raw/map @ 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.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Tue, 18 Mar 2008 04:07:39 -0300 |
parents | 673d8a6bc709 |
children | a04d8cadb6af |
line wrap: on
line source
mimetype = 'text/plain; charset={encoding}' header = '' footer = '' changeset = changeset.tmpl difflineplus = '#line#' difflineminus = '#line#' difflineat = '#line#' diffline = '#line#' changesetparent = '# Parent #node#' changesetchild = '# Child #node#' filenodelink = '' fileline = '#line#' diffblock = '#lines#' filediff = filediff.tmpl fileannotate = fileannotate.tmpl annotateline = '#author#@#rev#: #line#' manifest = manifest.tmpl direntry = 'drwxr-xr-x {basename}\n' fileentry = '{permissions|permissions} {size} {basename}\n' index = index.tmpl notfound = notfound.tmpl error = error.tmpl indexentry = '#url#\n'