Mercurial > hg > mercurial-crew-with-dirclash
view templates/map @ 146:4a828422247d
Handle merge with deletions
If you merge with a repo that has deleted a file after editing it, hg
attempted to resolve the file. This (correctly) resulted in hg verify
errors because the resolved version didn't show up in the manifests.
This moves the manifest resolution before file resolution and decides
which files to resolve based on the (partially) resolved manifest.
After files are resolved, the final manifest is committed.
| author | mpm@selenic.com |
|---|---|
| date | Tue, 24 May 2005 20:30:35 -0800 |
| parents | bf325dce498e |
| children | 1d5f799ebe1e 083c38bdfa64 |
line wrap: on
line source
header = header.tmpl footer = footer.tmpl changelog = changelog.tmpl naventry = "<a href="?cmd=changelog;rev=#rev#">#rev#</a> " filedifflink = "<a href="?cmd=filediff;node=#node#;file=#file#">#file#</a> " filenodelink = "<a href="?cmd=file;filenode=#filenode#;file=#file#">#file#</a> " fileellipses = "..." changelogentry = changelogentry.tmpl changeset = changeset.tmpl manifest = manifest.tmpl manifestdirentry = "<div class=parity#parity#><a href="?cmd=manifest;manifest=#manifest#;path=#path#">#basename#/</a><br /></div>" manifestfileentry = "<div class=parity#parity#><a href="?cmd=file;filenode=#filenode#;file=#file#">#basename#</a><br /></div>" filerevision = filerevision.tmpl fileannotate = fileannotate.tmpl filediff = filediff.tmpl filelog = filelog.tmpl fileline = "<div class=parity#parity#><span class=lineno>#linenumber# </span>#line#</div>" filelogentry = filelogentry.tmpl annotateline = "<tr class=parity#parity#><td class=annotate><a href="?cmd=changeset;node=#node#">#author#@#rev#</a></td><td><pre>#line#</pre></td></tr>" difflineplus = "<span class=plusline>#line#</span>" difflineminus = "<span class=minusline>#line#</span>" difflineat = "<span class=atline>#line#</span>" diffline = "#line#" changelogparent = "<tr><td align=right>parent: </td><td><a href="?cmd=changeset;node=#node#">#rev#:#node#</a></td></tr>" changesetparent = "<tr><td class=metatag>parent:</td><td><a href="?cmd=changeset;node=#node#">#rev#:#node#</a></td></tr>" filerevparent = "<tr><td class=metatag>parent:</td><td><a href="?cmd=changeset;node=#node#">#rev#:#node#</a></td></tr>" fileannotateparent = "<tr><td class=metatag>parent:</td><td><a href="?cmd=changeset;node=#node#">#rev#:#node#</a></td></tr>"