view templates/changelogentry.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 <[e-mail]>

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-----

<div class="parity#parity#">
<table width="100%" cellpadding="0" cellspacing="0">
<tr>
 <td align="right" width="15%"><b>#date|age# ago:&nbsp;</b></td>
 <td><b>#desc|firstline|escape#</b></td></tr>
<tr>
 <td align="right">changeset #rev#:&nbsp;</td>
 <td><a href="?cmd=changeset;node=#node#">#node|short#</a></td></tr>
#parent1#
#parent2#
<tr>
 <td align="right">author:&nbsp;</td>
 <td>#author|obfuscate#</td></tr>
<tr>
 <td align="right">date:&nbsp;</td>
 <td>#date|date#</td></tr>
<tr>
 <td align="right" valign="top"><a href="?cmd=manifest;manifest=#manifest#;path=/">files</a>:&nbsp;</td>
 <td>#files#</td></tr>
</table>
</div>