Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/header.tmpl @ 990:5007e0bdeed2
Fix long-standing excessive file merges
Since switching to the multihead approach, we've been creating
excessive file-level merges where files are marked as merged with
their ancestors.
This explicitly checks at commit time whether the two parent versions
are linearly related, and if so, reduces the file check-in to a
non-merge. Then the file is compared against the remaining parent,
and, if equal, skips check-in of that file (as it's not changed).
Since we're not checking in all files that were different between
versions, we no longer need to mark so many files for merge. This
removes most of the 'm' state marking as well.
Finally, it is possible to do a tree-level merge with no file-level
changes. This will happen if one user changes file A and another
changes file B. Thus, if we have have two parents, we allow commit to
proceed even if there are no file-level changes.
author | mpm@selenic.com |
---|---|
date | Sun, 21 Aug 2005 21:59:55 -0700 |
parents | dbe0ce2ae196 |
children | 2073e5a71008 |
rev | line source |
---|---|
142 | 1 Content-type: text/html |
2 | |
154
1d5f799ebe1e
fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents:
142
diff
changeset
|
3 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> |
142 | 4 <html> |
5 <head> | |
6 <style type="text/css"> | |
583
415054ea31c1
[PATCH] Hide style from non conformant agents
mpm@selenic.com
parents:
172
diff
changeset
|
7 <!-- |
142 | 8 a { text-decoration:none; } |
172
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
9 .parity0 { background-color: #dddddd; } |
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
10 .parity1 { background-color: #eeeeee; } |
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
11 .lineno { width: 60px; color: #aaaaaa; font-size: smaller; } |
142 | 12 .plusline { color: green; } |
13 .minusline { color: red; } | |
14 .atline { color: purple; } | |
15 .annotate { font-size: smaller; text-align: right; padding-right: 1em; } | |
16 .buttons a { | |
17 background-color: #666666; | |
18 padding: 2pt; | |
19 color: white; | |
20 font-family: sans; | |
21 font-weight: bold; | |
22 } | |
23 .metatag { | |
24 background-color: #888888; | |
25 color: white; | |
26 text-align: right; | |
27 } | |
585 | 28 |
602 | 29 /* Common */ |
672
dbe0ce2ae196
More IE friendly diff output related templates.
Edouard Gomez <ed.gomez@free.fr>
parents:
602
diff
changeset
|
30 pre { margin: 0; } |
dbe0ce2ae196
More IE friendly diff output related templates.
Edouard Gomez <ed.gomez@free.fr>
parents:
602
diff
changeset
|
31 |
602 | 32 |
585 | 33 /* Changelog entries */ |
34 .changelogEntry { width: 100%; } | |
35 .changelogEntry th { font-weight: normal; text-align: right; vertical-align: top; width: 15%;} | |
36 .changelogEntry th.age, .changelogEntry th.firstline { font-weight: bold; } | |
37 .changelogEntry th.firstline { text-align: left; width: inherit; } | |
586 | 38 |
39 /* Tag entries */ | |
40 #tagEntries { list-style: none; margin: 0; padding: 0; } | |
41 #tagEntries .tagEntry { list-style: none; margin: 0; padding: 0; } | |
42 #tagEntries .tagEntry span.node { font-family: monospace; } | |
602 | 43 |
44 /* Changeset entry */ | |
45 #changesetEntry { } | |
46 #changesetEntry th { font-weight: normal; background-color: #888; color: #fff; text-align: right; } | |
47 #changesetEntry th.files, #changesetEntry th.description { vertical-align: top; } | |
48 | |
49 /* File diff view */ | |
50 #filediffEntry { } | |
51 #filediffEntry th { font-weight: normal; background-color: #888; color: #fff; text-align: right; } | |
672
dbe0ce2ae196
More IE friendly diff output related templates.
Edouard Gomez <ed.gomez@free.fr>
parents:
602
diff
changeset
|
52 |
583
415054ea31c1
[PATCH] Hide style from non conformant agents
mpm@selenic.com
parents:
172
diff
changeset
|
53 --> |
142 | 54 </style> |