Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/changeset.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 | ce8f31e0b3b8 |
children |
rev | line source |
---|---|
142 | 1 #header# |
375 | 2 <title>#repo|escape#: changeset #node|short#</title> |
142 | 3 </head> |
4 <body> | |
138 | 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:
3272
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:
3272
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:
3272
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:
3272
diff
changeset
|
10 <a href="#url#file/#node|short#{sessionvars%urlparameter}">manifest</a> |
3264
d1aa83f199ef
Update templates to use NewWebInterface
Brendan Cully <brendan@kublai.com>
parents:
3205
diff
changeset
|
11 <a href="#url#raw-rev/#node|short#">raw</a> |
1078 | 12 #archives%archiveentry# |
142 | 13 </div> |
138 | 14 |
1445
56281e086f38
hgweb: add strip and rstrip filters to handle summary
TK Soh <teekaysoh@yahoo.com>
parents:
1417
diff
changeset
|
15 <h2>changeset: #desc|strip|escape|firstline#</h2> |
138 | 16 |
602 | 17 <table id="changesetEntry"> |
138 | 18 <tr> |
602 | 19 <th class="changeset">changeset #rev#:</th> |
3363
ce8f31e0b3b8
hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3272
diff
changeset
|
20 <td class="changeset"><a href="#url#rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td> |
602 | 21 </tr> |
1416
19d2776f1725
hgweb: hide trivial parent (like in show_changeset)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1412
diff
changeset
|
22 #parent%changesetparent# |
1606
ba625c8083d8
- duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents:
1445
diff
changeset
|
23 #child%changesetchild# |
568 | 24 #changesettag# |
138 | 25 <tr> |
602 | 26 <th class="author">author:</th> |
27 <td class="author">#author|obfuscate#</td> | |
28 </tr> | |
138 | 29 <tr> |
602 | 30 <th class="date">date:</th> |
31 <td class="date">#date|date# (#date|age# ago)</td></tr> | |
138 | 32 <tr> |
602 | 33 <th class="files">files:</th> |
34 <td class="files">#files#</td></tr> | |
138 | 35 <tr> |
602 | 36 <th class="description">description:</th> |
1445
56281e086f38
hgweb: add strip and rstrip filters to handle summary
TK Soh <teekaysoh@yahoo.com>
parents:
1417
diff
changeset
|
37 <td class="description">#desc|strip|escape|addbreaks#</td> |
602 | 38 </tr> |
138 | 39 </table> |
40 | |
672
dbe0ce2ae196
More IE friendly diff output related templates.
Edouard Gomez <ed.gomez@free.fr>
parents:
602
diff
changeset
|
41 <div id="changesetDiff"> |
138 | 42 #diff# |
602 | 43 </div> |
138 | 44 |
1417
90b62337f8dd
hgweb: add a mercurial link to the footer
Matt Mackall <mpm@selenic.com>
parents:
1416
diff
changeset
|
45 #footer# |
138 | 46 |
47 |