Mercurial > hg
view templates/filerevision.tmpl @ 408:3695fbd2c33b
[PATCH] Merging files that are deleted in both branches
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] Merging files that are deleted in both branches
From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk>
OK, attached is an improved version of this patch...
When I went back through it, I discovered that the prior version was wrong
when doing real merges (as opposed to jumping between revisions that have
a simple linear relationship). So that's been addressed here, too.
> Here's an hg changeset patch that deals with simultaneous deletion of a
file
> in both the working directory and in a merged branch.
>
> Test case included in the patch.
manifest hash: c8078733c252403314d8046efa6ecefc49c83050
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCuNF8ywK+sNU5EO8RArtdAJ9syw/JXRZzP1sxnEYXzZywkJLAPACeKpqL
5osA3AggrCbbSLTNcYVXJ8U=
=T5Ik
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Tue, 21 Jun 2005 18:48:28 -0800 |
parents | e5d769afd3ef |
children | 2ee819a950aa |
line wrap: on
line source
#header# <title>#repo|escape#:#file#</title> </head> <body> <div class="buttons"> <a href="?cmd=changelog;rev=#rev#">changelog</a> <a href="?cmd=tags">tags</a> <a href="?cmd=changeset;node=#node#">changeset</a> <a href="?cmd=manifest;manifest=#manifest#;path=#path#">manifest</a> <a href="?cmd=filelog;file=#file#;filenode=#filenode#">revisions</a> <a href="?cmd=annotate;file=#file#;filenode=#filenode#">annotate</a> <a href="?cmd=file;file=#file#;filenode=#filenode#;style=raw">raw</a> </div> <h2>#file# (revision #filenode|short#)</h2> <table> <tr> <td class="metatag">changeset #rev#:</td> <td><a href="?cmd=changeset;node=#node#">#node|short#</a></td></tr> #parent1# #parent2# <tr> <td class="metatag">manifest:</td> <td><a href="?cmd=manifest;manifest=#manifest#;path=/">#manifest|short#</a></td></tr> <tr> <td class="metatag">author:</td> <td>#author|obfuscate#</td></tr> <tr> <td class="metatag">date:</td> <td>#date|date# (#date|age# ago)</td></tr> <tr> <td class="metatag">permissions:</td> <td>#permissions|permissions#</td></tr> </table> <pre> #text# </pre> #footer#