templates/changelog.tmpl
author mpm@selenic.com
Tue, 21 Jun 2005 18:41:57 -0800
changeset 407 0e0d0670b2bc
parent 201 f918a6fa2572
child 584 9bdf5ae63d1f
permissions -rw-r--r--
[PATCH] Merging identical changes from another branch -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Merging identical changes from another branch From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk> The issue comes up when a local uncommitted *new* file (i.e. not in the current manifest) is being merged with an identical file from a branch. Since the file is not in the current manifest (it's either in the current "to-be-added" list, or in the "unknown" state), there's no (local) node from which to create a mergepoint. manifest hash: 4e64ce654a6473524789a97bbaf8bff61b4343af -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuM/1ywK+sNU5EO8RAn7xAKCJoH/CgzVK4h4xPJDrd2lY9XOINACgmt01 92uuMswZXcoCchQAaxew7C0= =qRsk -----END PGP SIGNATURE-----
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
142
529bf610092e Prettify the web interface
mpm@selenic.com
parents: 138
diff changeset
     1
#header#
201
f918a6fa2572 hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents: 173
diff changeset
     2
<title>#repo|escape#: changelog</title>
142
529bf610092e Prettify the web interface
mpm@selenic.com
parents: 138
diff changeset
     3
</head>
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
     4
<body>
168
65cf1b0cfe86 hgweb: add tags links and manifest links
mpm@selenic.com
parents: 165
diff changeset
     5
65cf1b0cfe86 hgweb: add tags links and manifest links
mpm@selenic.com
parents: 165
diff changeset
     6
<div class="buttons">
65cf1b0cfe86 hgweb: add tags links and manifest links
mpm@selenic.com
parents: 165
diff changeset
     7
<a href="?cmd=tags">tags</a>
65cf1b0cfe86 hgweb: add tags links and manifest links
mpm@selenic.com
parents: 165
diff changeset
     8
<a href="?cmd=manifest;manifest=#manifest#;path=/">manifest</a>
65cf1b0cfe86 hgweb: add tags links and manifest links
mpm@selenic.com
parents: 165
diff changeset
     9
</div>
65cf1b0cfe86 hgweb: add tags links and manifest links
mpm@selenic.com
parents: 165
diff changeset
    10
201
f918a6fa2572 hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents: 173
diff changeset
    11
<h2>changelog for #repo|escape#</h2>
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
    12
165
7fc8385df514 Add tag/rev/node search to hgweb
mpm@selenic.com
parents: 142
diff changeset
    13
<form>
7fc8385df514 Add tag/rev/node search to hgweb
mpm@selenic.com
parents: 142
diff changeset
    14
search:
7fc8385df514 Add tag/rev/node search to hgweb
mpm@selenic.com
parents: 142
diff changeset
    15
<input type="hidden" name="cmd" value="changelog">
7fc8385df514 Add tag/rev/node search to hgweb
mpm@selenic.com
parents: 142
diff changeset
    16
<input name="rev" type="text" width="30">
173
8da1df932c16 hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents: 168
diff changeset
    17
navigate: <small>#changenav#</small><br/>
165
7fc8385df514 Add tag/rev/node search to hgweb
mpm@selenic.com
parents: 142
diff changeset
    18
</form>
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
    19
142
529bf610092e Prettify the web interface
mpm@selenic.com
parents: 138
diff changeset
    20
#entries#
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
    21
165
7fc8385df514 Add tag/rev/node search to hgweb
mpm@selenic.com
parents: 142
diff changeset
    22
<form>
7fc8385df514 Add tag/rev/node search to hgweb
mpm@selenic.com
parents: 142
diff changeset
    23
search:
7fc8385df514 Add tag/rev/node search to hgweb
mpm@selenic.com
parents: 142
diff changeset
    24
<input type="hidden" name="cmd" value="changelog">
7fc8385df514 Add tag/rev/node search to hgweb
mpm@selenic.com
parents: 142
diff changeset
    25
<input name="rev" type="text" width="30">
173
8da1df932c16 hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents: 168
diff changeset
    26
navigate: <small>#changenav#</small><br/>
165
7fc8385df514 Add tag/rev/node search to hgweb
mpm@selenic.com
parents: 142
diff changeset
    27
</form>
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
    28
142
529bf610092e Prettify the web interface
mpm@selenic.com
parents: 138
diff changeset
    29
#footer#