Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/manifest.tmpl @ 5210:90d9ec0dc69d
merge: forcefully mark files that we get from the second parent as dirty
After a hg merge, we want to include in the commit all the files that we
got from the second parent, so that we have the correct file-level
history. To make them visible to hg commit, we try to mark them as dirty.
Unfortunately, right now we can't really mark them as dirty[1] - the
best we can do is to mark them as needing a full comparison of their
contents, but they will still be considered clean if they happen to be
identical to the version in the first parent.
This changeset extends the dirstate format in a compatible way, so that
we can mark a file as dirty:
Right now we use a negative file size to indicate we don't have valid
stat data for this entry. In practice, this size is always -1.
This patch uses -2 to indicate that the entry is dirty. Older versions
of hg won't choke on this dirstate, but they may happily mark the file
as clean after a full comparison, destroying all of our hard work.
The patch adds a dirstate.normallookup method with the semantics of the
current normaldirty, and changes normaldirty to forcefully mark the
entry as dirty.
This should fix issue522.
[1] - well, we could put them in state 'm', but that state has a
different meaning.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Thu, 23 Aug 2007 01:48:29 -0300 |
parents | e19d9b1223ee |
children | 6e0f05f6f68d |
rev | line source |
---|---|
142 | 1 #header# |
3205 | 2 <title>#repo|escape#: manifest for changeset #node|short#</title> |
142 | 3 </head> |
138 | 4 <body> |
5 | |
154
1d5f799ebe1e
fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents:
153
diff
changeset
|
6 <div class="buttons"> |
3363
ce8f31e0b3b8
hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3311
diff
changeset
|
7 <a href="#url#log/#rev#{sessionvars%urlparameter}">changelog</a> |
ce8f31e0b3b8
hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3311
diff
changeset
|
8 <a href="#url#shortlog/#rev#{sessionvars%urlparameter}">shortlog</a> |
ce8f31e0b3b8
hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3311
diff
changeset
|
9 <a href="#url#tags{sessionvars%urlparameter}">tags</a> |
ce8f31e0b3b8
hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3311
diff
changeset
|
10 <a href="#url#rev/#node|short#{sessionvars%urlparameter}">changeset</a> |
1498
78590fb4a82b
hgweb: Added archive download buttons to manifest page.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1410
diff
changeset
|
11 #archives%archiveentry# |
142 | 12 </div> |
138 | 13 |
1650
f2ebd5251e88
changed template escape filter, added urlescape filter; audited all templates for insertion bugs; added note to manifest.py about newlines in filenames
Peter van Dijk <peter@dataloss.nl>
parents:
1498
diff
changeset
|
14 <h2>manifest for changeset #node|short#: #path|escape#</h2> |
138 | 15 |
359 | 16 <table cellpadding="0" cellspacing="0"> |
4457
e19d9b1223ee
hgweb: manifest: pass parity for the '[up]' link
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
3363
diff
changeset
|
17 <tr class="parity#upparity#"> |
359 | 18 <td><tt>drwxr-xr-x</tt> |
3311
0708bdb4987a
hgweb: add file sizes to manifest browsing
Matt Mackall <mpm@selenic.com>
parents:
3272
diff
changeset
|
19 <td> |
3363
ce8f31e0b3b8
hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3311
diff
changeset
|
20 <td><a href="#url#file/#node|short##up|urlescape#{sessionvars%urlparameter}">[up]</a> |
3311
0708bdb4987a
hgweb: add file sizes to manifest browsing
Matt Mackall <mpm@selenic.com>
parents:
3272
diff
changeset
|
21 </tr> |
979
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
377
diff
changeset
|
22 #dentries%manifestdirentry# |
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
377
diff
changeset
|
23 #fentries%manifestfileentry# |
359 | 24 </table> |
153
e8a360cd5a9f
changed pos to rev for changelog cmd, changed & to ;
jake@edge2.net
parents:
142
diff
changeset
|
25 #footer# |