Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/old/search.tmpl @ 5483:0c43f87baba3 default tip
Fix file-changed-to-dir and dir-to-file commits (issue660).
Allow adding to dirstate files that clash with previously existing
but marked for removal. Protect from reintroducing clashes by revert.
This change doesn't address related issues with update. Current
workaround is to do "clean" update by manually removing conflicting
files/dirs from working directory.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sat, 27 Oct 2007 16:27:55 +0400 |
parents | fc34c031ff54 |
children |
rev | line source |
---|---|
538 | 1 #header# |
2 <title>#repo|escape#: searching for #query|escape#</title> | |
3 </head> | |
4 <body> | |
5 | |
6 <div class="buttons"> | |
1432
612f3eba73ee
hgweb: fix broken search->changelog link
TK Soh <teekaysoh@yahoo.com>
parents:
1410
diff
changeset
|
7 <a href="?cl=tip">changelog</a> |
2687
46b19175fec6
[hgweb] links to shortlog for the default templates
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
1441
diff
changeset
|
8 <a href="?sl=tip">shortlog</a> |
1410
17703aa4491e
hgweb: shorten all the URLs in the standard templates
Matt Mackall <mpm@selenic.com>
parents:
538
diff
changeset
|
9 <a href="?tags=">tags</a> |
3205 | 10 <a href="?mf=#node|short#;path=/">manifest</a> |
538 | 11 </div> |
12 | |
13 <h2>searching for #query|escape#</h2> | |
14 | |
15 <form> | |
1441
cbc36ad70945
hgweb: a couple of fixes on search page
TK Soh <teekaysoh@yahoo.com>
parents:
1432
diff
changeset
|
16 <p> |
538 | 17 search: |
18 <input type="hidden" name="cmd" value="changelog"> | |
19 <input name="rev" type="text" width="30" value="#query|escape#"> | |
1441
cbc36ad70945
hgweb: a couple of fixes on search page
TK Soh <teekaysoh@yahoo.com>
parents:
1432
diff
changeset
|
20 </p> |
538 | 21 </form> |
22 | |
23 #entries# | |
24 | |
25 <form> | |
1441
cbc36ad70945
hgweb: a couple of fixes on search page
TK Soh <teekaysoh@yahoo.com>
parents:
1432
diff
changeset
|
26 <p> |
538 | 27 search: |
28 <input type="hidden" name="cmd" value="changelog"> | |
1441
cbc36ad70945
hgweb: a couple of fixes on search page
TK Soh <teekaysoh@yahoo.com>
parents:
1432
diff
changeset
|
29 <input name="rev" type="text" width="30" value="#query|escape#"> |
cbc36ad70945
hgweb: a couple of fixes on search page
TK Soh <teekaysoh@yahoo.com>
parents:
1432
diff
changeset
|
30 </p> |
538 | 31 </form> |
32 | |
33 #footer# |