Mercurial > hg > mercurial-crew-with-dirclash
view templates/filediff.tmpl @ 1072:05dc7aba22eb
Fixes for push corner case
TAH found a bug where push would push things the remote already had,
raising an assertion. This turned out to be because the changeset
protocol was not recording a common subset node in one case.
Also discovered was that the protocol was queueing multiple copies of
a node for pull. Fixed by changing fetch to a hash.
Add some more debugging output.
author | mpm@selenic.com |
---|---|
date | Fri, 26 Aug 2005 16:49:23 -0700 |
parents | dbe0ce2ae196 |
children | 17703aa4491e |
line wrap: on
line source
#header# <title>#repo|escape#: #file# diff</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=file;file=#file#;filenode=#filenode#">file</a> <a href="?cmd=filelog;file=#file#;filenode=#filenode#">revisions</a> <a href="?cmd=annotate;file=#file#;filenode=#filenode#">annotate</a> <a href="?cmd=filediff;file=#file#;node=#node#;style=raw">raw</a> </div> <h2>#file#</h2> <table id="filediffEntry"> <tr> <th class="revision">revision #rev#:</th> <td class="revision"><a href="?cmd=changeset;node=#node#">#node|short#</a></td> </tr> #parent# </table> <div id="fileDiff"> #diff# </div> #footer#