Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/changelog.tmpl @ 254:c03f58e5fd2d
unify checkout and resolve into update
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
unify checkout and resolve into update
This replaces checkout and resolve with a single command:
$ hg help co
hg update [node]
update or merge working directory
If there are no outstanding changes in the working directory and
there is a linear relationship between the current version and the
requested version, the result is the requested version.
Otherwise the result is a merge between the contents of the
current working directory and the requested version. Files that
changed between either parent are marked as changed for the next
commit and a commit must be performed before any further updates
are allowed.
manifest hash: 513d285d7fb775d0560de49387042a685ea062f7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFComS7ywK+sNU5EO8RAmgRAJ96GA6qvHLy0Jp0fzUrR2os2azPuACePsdC
YBldZtA7yIuTnV2vIbn7OSE=
=QtM/
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Sat, 04 Jun 2005 18:34:35 -0800 |
parents | f918a6fa2572 |
children | 9bdf5ae63d1f |
rev | line source |
---|---|
142 | 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 | 3 </head> |
138 | 4 <body> |
168 | 5 |
6 <div class="buttons"> | |
7 <a href="?cmd=tags">tags</a> | |
8 <a href="?cmd=manifest;manifest=#manifest#;path=/">manifest</a> | |
9 </div> | |
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 | 12 |
165 | 13 <form> |
14 search: | |
15 <input type="hidden" name="cmd" value="changelog"> | |
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 | 18 </form> |
138 | 19 |
142 | 20 #entries# |
138 | 21 |
165 | 22 <form> |
23 search: | |
24 <input type="hidden" name="cmd" value="changelog"> | |
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 | 27 </form> |
138 | 28 |
142 | 29 #footer# |