mpm@selenic.com [Wed, 15 Jun 2005 00:27:20 -0800] rev 346
merge3: fix argument order
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
merge3: fix argument order
We were passing the wrong argument order to hgmerge. Add a merge
conflict test case.
manifest hash: 2d88786a3f31dcaa9d44f564c21f0d2a4f14f09c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD4DBQFCr+ZoywK+sNU5EO8RAouJAKCOx5oxhVXkLqsfCPBXx0+wP5IeogCYoZzF
ooZT2fyN3tL3uVM2YP8KcA==
=O4fE
-----END PGP SIGNATURE-----
mpm@selenic.com [Wed, 15 Jun 2005 00:10:18 -0800] rev 345
Add a tags/identify test group
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Add a tags/identify test group
manifest hash: 25c43d62cea41cddad1c2f1c82c44f0ac1841fca
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCr+JqywK+sNU5EO8RAtqxAJ0bgpL+W1fk8NH9s1eLH6AgM/EXQQCfaOy8
B6L71BwVMcuPukHb3MEtFnQ=
=gwew
-----END PGP SIGNATURE-----
mpm@selenic.com [Wed, 15 Jun 2005 00:09:19 -0800] rev 344
Fix yet another resolve corner case
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Fix yet another resolve corner case
manifest hash: a194321b5cd718a3c31f327c5145a4ebd8dd4ef4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCr+IvywK+sNU5EO8RAt49AJwLBBq7AZfo1WqcwZvzSVENvJGLmgCePumQ
0/9RwjL/PorsvFJi+CiFYyY=
=S6HA
-----END PGP SIGNATURE-----
mpm@selenic.com [Wed, 15 Jun 2005 00:08:03 -0800] rev 343
rework all code using tags
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
rework all code using tags
Add three utility functions:
tags(): get (and possibly load) the tags mapping
tagslist(): sort tag,node by revision (aka topologically)
nodetags(): return a list of tags associated with a node (also cached)
Update all the code using tags to use these.
Simplify identify code
make unknown always visible if printed
don't ignore tip pseudo-tag
manifest hash: e6deb4d545ad465be7735f9ec43227bcb5e238c7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCr+HjywK+sNU5EO8RAh4/AJ90cI0WxmvQAj6Lq2ZiG8LmqZan/QCfR8B5
ltu8tOIEHDa8LhfS9wtBu0k=
=pv3t
-----END PGP SIGNATURE-----
mpm@selenic.com [Wed, 15 Jun 2005 00:03:25 -0800] rev 342
update help test for identify
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
update help test for identify
manifest hash: 38a41136c79411b0c926f93c54684a0716c11d68
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCr+DNywK+sNU5EO8RAjDoAKCv6JGj9TkDtu3cn82zjlWyUJvfUwCcCh/u
LPzNYK6Cy29IZ4TKApmPUoQ=
=edY/
-----END PGP SIGNATURE-----
mpm@selenic.com [Wed, 15 Jun 2005 00:02:13 -0800] rev 341
run-tests: actually mark changed output as failure
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
run-tests: actually mark changed output as failure
manifest hash: d657fbfb2f3bcf24038f20b17d776248e4b63b6b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCr+CFywK+sNU5EO8RAhNnAKCa7xzxe4JEktfysqHIcerhwhtmnQCgsPgI
PDh6sYNfpsfNjFzrqYCh5A4=
=SOg/
-----END PGP SIGNATURE-----
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 15 Jun 2005 07:07:05 +0100] rev 340
Handle the case where the current working copy is not based on a checkout.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Handle the case where the current working copy is not based on a checkout.
Print 'unknown' in verbose mode and nothing otherwise.
manifest hash: 5742c3c3a762b77ee1aeb62ed53b8f2d8e47a05d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFCr8WJW7P1GVgWeRoRAtNkAJ9Qea4u8GG8zdSk87qLApT88KMrgQCeO22w
bJ12ieVHvLzc2NNAGV+zbeQ=
=IYni
-----END PGP SIGNATURE-----