templates/notfound.tmpl
author Matt Mackall <mpm@selenic.com>
Wed, 01 Aug 2007 12:33:12 -0500
changeset 5045 f191bc3916f7
parent 1549 fbe4bbd847e5
permissions -rw-r--r--
merge: do early copy to deal with issue636 Without copies/renames, merges source names are 1:1 with their targets. Copies and renames introduce the possibility that there will be two merges with the same input but different output. By doing the copy to the destination name before the merge, the actual merge becomes 1:1 again, and no source is the input to two different merges. - add a preliminary scan to applyupdates to do copies - for the merge action, pass the old name (for finding ancestors) and the new name (for input to the merge) to filemerge - eliminate the old post-merge copy - lookup file contents from new name in filemerge - pass new name to external merge helper - report merge failure at new name - add a test
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1124
725204f67d92 Add the template.
Ollivier Robert <roberto@keltia.freenix.fr>
parents:
diff changeset
     1
#header#
725204f67d92 Add the template.
Ollivier Robert <roberto@keltia.freenix.fr>
parents:
diff changeset
     2
<title>Mercurial repositories index</title>
725204f67d92 Add the template.
Ollivier Robert <roberto@keltia.freenix.fr>
parents:
diff changeset
     3
</head>
725204f67d92 Add the template.
Ollivier Robert <roberto@keltia.freenix.fr>
parents:
diff changeset
     4
<body>
725204f67d92 Add the template.
Ollivier Robert <roberto@keltia.freenix.fr>
parents:
diff changeset
     5
725204f67d92 Add the template.
Ollivier Robert <roberto@keltia.freenix.fr>
parents:
diff changeset
     6
<h2>Mercurial Repositories</h2>
725204f67d92 Add the template.
Ollivier Robert <roberto@keltia.freenix.fr>
parents:
diff changeset
     7
1549
fbe4bbd847e5 Always escape repository name in hgweb, very important in notfound.tmpl.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1137
diff changeset
     8
The specified repository "#repo|escape#" is unknown, sorry.
1124
725204f67d92 Add the template.
Ollivier Robert <roberto@keltia.freenix.fr>
parents:
diff changeset
     9
1137
c54d03bdf2dc Remove the link from the template as there no real way to have it always be correct.
Ollivier Robert <roberto@keltia.freenix.fr>
parents: 1124
diff changeset
    10
Please go back to the main repository list page.
1124
725204f67d92 Add the template.
Ollivier Robert <roberto@keltia.freenix.fr>
parents:
diff changeset
    11
725204f67d92 Add the template.
Ollivier Robert <roberto@keltia.freenix.fr>
parents:
diff changeset
    12
#footer#