templates/header.tmpl
author maf46@burn.cl.cam.ac.uk
Mon, 04 Jul 2005 12:38:34 -0800
changeset 616 d45d1c90032e
parent 602 56d81b303656
child 672 dbe0ce2ae196
permissions -rw-r--r--
Fix zombie files in merge # HG changeset patch # User maf46@burn.cl.cam.ac.uk # Node ID 57667c9b93a5a743e4629d15a0e6bd76699130c3 # Parent d2994b5298fb20f87dc1d4747635b280db3c0526 Fix zombie files in merge Keir Fraser observed the following: > I made a small test case that illustrates the bug in merging changesets > with 'hg remove's in them: > > 1. Create a repository A containing files foo & bar. > 2. Create clone called B. > 3. A removes file bar, and commits this removal. > 4. B edits file foo, and commits this edit. > > Now, if B: > # hg pull ../A; hg update -m; hg commit > Then bar remains deleted. > > If A: > # hg pull ../B; hg update -m; hg commit > Then bar is resurrected! > > It looks as though, when you merge across a branch, any deletions in > your own branch are forgotten. > ... > Fixing this is a must, as zombie files are a real pain. :-) Keir later patched our local copy of hg as shown below, which fixes the problem. I've also enclosed a test which captures the test Keir outlined... Files deleted on a branch should not automatically reappear in a merge Patch notes: 1. The first chunk does not change behaviour, but cleans up the code to more closely match check of 'force' in the second chunk. I think it makes the code clearer. 2. The second chunk fixes two bugs -- i. If we choose to keep a remotely-changed locally-deleted file, then we need to 'get' that file. If we choose to delete it then no action need be taken (it is already deleted in the working manifest). Without this fix, choosing to delete would get a Python traceback. ii. The test for whether the file was remotely-created is insufficient. It is only true if f is not in the common ancestor. Otherwise the file was deleted locally, and should remain deleted. (this is the most important fix!) Index: hg/tests/test-merge6 ===================================================================
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
142
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
     1
Content-type: text/html
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
     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
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
     4
<html>
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
     5
<head>
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
     6
<style type="text/css">
583
415054ea31c1 [PATCH] Hide style from non conformant agents
mpm@selenic.com
parents: 172
diff changeset
     7
<!--
142
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
     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
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
    12
.plusline { color: green; }
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
    13
.minusline { color: red; }
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
    14
.atline { color: purple; }
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
    15
.annotate { font-size: smaller; text-align: right; padding-right: 1em; }
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
    16
.buttons a {
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
    17
  background-color: #666666;
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
    18
  padding: 2pt;
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
    19
  color: white;
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
    20
  font-family: sans;
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
    21
  font-weight: bold;
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
    22
}
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
    23
.metatag {
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
    24
  background-color: #888888;
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
    25
  color: white;
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
    26
  text-align: right; 
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
    27
}
585
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 583
diff changeset
    28
602
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 586
diff changeset
    29
/* Common */
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 586
diff changeset
    30
.pre { font-family: monospace; white-space: pre; }
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 586
diff changeset
    31
585
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 583
diff changeset
    32
/* Changelog entries */
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 583
diff changeset
    33
.changelogEntry { width: 100%; }
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 583
diff changeset
    34
.changelogEntry th { font-weight: normal; text-align: right; vertical-align: top; width: 15%;}
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 583
diff changeset
    35
.changelogEntry th.age, .changelogEntry th.firstline { font-weight: bold; }
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 583
diff changeset
    36
.changelogEntry th.firstline { text-align: left; width: inherit; }
586
11578820b5d7 [PATCH] Tags template cleanup
mpm@selenic.com
parents: 585
diff changeset
    37
11578820b5d7 [PATCH] Tags template cleanup
mpm@selenic.com
parents: 585
diff changeset
    38
/* Tag entries */
11578820b5d7 [PATCH] Tags template cleanup
mpm@selenic.com
parents: 585
diff changeset
    39
#tagEntries { list-style: none; margin: 0; padding: 0; }
11578820b5d7 [PATCH] Tags template cleanup
mpm@selenic.com
parents: 585
diff changeset
    40
#tagEntries .tagEntry { list-style: none; margin: 0; padding: 0; }
11578820b5d7 [PATCH] Tags template cleanup
mpm@selenic.com
parents: 585
diff changeset
    41
#tagEntries .tagEntry span.node { font-family: monospace; }
602
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 586
diff changeset
    42
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 586
diff changeset
    43
/* Changeset entry */
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 586
diff changeset
    44
#changesetEntry { }
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 586
diff changeset
    45
#changesetEntry th { font-weight: normal; background-color: #888; color: #fff; text-align: right; }
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 586
diff changeset
    46
#changesetEntry th.files, #changesetEntry th.description { vertical-align: top; }
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 586
diff changeset
    47
#changesetDiff ul, #changesetDiff li { list-style: none; margin: 0; padding: 0; }
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 586
diff changeset
    48
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 586
diff changeset
    49
/* File diff view */
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 586
diff changeset
    50
#filediffEntry { }
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 586
diff changeset
    51
#filediffEntry th { font-weight: normal; background-color: #888; color: #fff; text-align: right; }
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 586
diff changeset
    52
#fileDiff ul, #fileDiff li { list-style: none; margin: 0; padding: 0; }
583
415054ea31c1 [PATCH] Hide style from non conformant agents
mpm@selenic.com
parents: 172
diff changeset
    53
-->
142
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
    54
</style>