mpm@selenic.com [Fri, 03 Jun 2005 18:42:53 -0800] rev 242
hgmerge: use diff3 if available
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
hgmerge: use diff3 if available
diff3 may be more readily available than merge
manifest hash:
67a314ac42aa78410d64a6c3d36c2d575a588533
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCoRUtywK+sNU5EO8RAmFPAJ0aN8VNvN9zpE/zov6wT3M98vGfDwCfXEOk
xZlQHYIGrCLOFQiCQxIfr7I=
=Asv9
-----END PGP SIGNATURE-----
mpm@selenic.com [Fri, 03 Jun 2005 18:29:46 -0800] rev 241
Resolve bits from TAH
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Resolve bits from TAH
manifest hash:
dc639d419de857b22da9f707cbb557c328eb12f5
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCoRIaywK+sNU5EO8RAswQAKCiEcQ5RV3C2JZXgQBch28VO3NpSgCdEzcD
Td8bV8IKVUIXtvrcy1rCZTY=
=tAU7
-----END PGP SIGNATURE-----
mpm@selenic.com [Fri, 03 Jun 2005 18:27:55 -0800] rev 240
Replace tkmerge with hgmerge
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Replace tkmerge with hgmerge
hgmerge attempts to find and use merge, kdiff3, tkmerge, and diff+patch.
hg will use hgmerge unless overridden with HGMERGE
manifest hash:
9137a620df4b235e66343b0fd0dba87fe631546e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCoRGrywK+sNU5EO8RAi2VAJ9bh97ChGJymP/p8rvCuyNAMnk1bQCgrIGP
vYI6qlyWKQZ01ObUTAIg92o=
=+mRH
-----END PGP SIGNATURE-----
mpm@selenic.com [Fri, 03 Jun 2005 13:44:34 -0800] rev 239
mdiff.py: kill #! line, add copyright notice
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
mdiff.py: kill #! line, add copyright notice
manifest hash:
acb4e14d5947d0fde5b89a874af0476773ee1cee
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCoM9CywK+sNU5EO8RAizVAJ41dqQxxx8nouBxJMcFmoVRRo4GfACbB9RV
Xc0cqaoPVL7p87opPKjgNWw=
=HyjH
-----END PGP SIGNATURE-----
mpm@selenic.com [Fri, 03 Jun 2005 13:43:17 -0800] rev 238
hgweb.py: kill #! line, clean up copyright notice
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
hgweb.py: kill #! line, clean up copyright notice
manifest hash:
a2910abe3f58687ccf55179ab37f66dee2b6e775
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCoM71ywK+sNU5EO8RAil4AJ9edZ1FJ0WbikVBYBMNO+MldBRqnACfRtuH
Nw/BuBueQfEhaI3i+9+Q9/g=
=vV8+
-----END PGP SIGNATURE-----
mpm@selenic.com [Fri, 03 Jun 2005 13:32:37 -0800] rev 237
Merge from tah
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 02 Jun 2005 09:23:44 +0100] rev 236
Removed extra closing brace from date string.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 02 Jun 2005 09:14:12 +0100] rev 235
Obfuscate author in all HTML templates.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 02 Jun 2005 07:06:29 +0100] rev 234
ui.warn can use more than one argument like the other ui methods.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 02 Jun 2005 07:05:56 +0100] rev 233
Add missing > to </td> in templates.
mpm@selenic.com [Fri, 03 Jun 2005 12:58:47 -0800] rev 232
hg resolve: merge a given node into the working directory
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
hg resolve: merge a given node into the working directory
This is the first pass at working directory-based merges. Doing a
resolve adds a second parent to the working directory state for the
next commit.
manifest hash:
827b19995dd2d7686286da3b62c7d5fe3e0bc48c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCoMSHywK+sNU5EO8RAnOkAJsHH9jviMJcQJ4JurFuSlrbIwKqRACdHgNC
kkfoAxX2E5jkuOeSJ1Hjalk=
=bdrT
-----END PGP SIGNATURE-----
mpm@selenic.com [Fri, 03 Jun 2005 12:56:50 -0800] rev 231
add 'm' state to dirstates
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
add 'm' state to dirstates
This state indicates that a file has been merged with resolve and must
be in the next commit.
manifest hash:
dc90629b73056b671f7be3de0283039c96c9ca0f
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCoMQSywK+sNU5EO8RAuxHAKCHckvSiLwegl5hbF5x5EeQg0MA2gCcCYD+
78Ol99Y9nk5ZA2bbYgM+AQw=
=vMOg
-----END PGP SIGNATURE-----
mpm@selenic.com [Fri, 03 Jun 2005 12:55:56 -0800] rev 230
make diffdir default to dirstate.parents()
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
make diffdir default to dirstate.parents()
update various diffdir users to use default
manifest hash:
aeca2b9da1aca278dd5e3f27cc2906667803577d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCoMPcywK+sNU5EO8RAkY8AJ90UHQXnJnkG9PJKG7IsgPeOZ2WZACgiarS
HhS2zX3TRM9WdZHo5nLvZGw=
=7YyP
-----END PGP SIGNATURE-----
mpm@selenic.com [Fri, 03 Jun 2005 12:54:54 -0800] rev 229
teach commit about dirstate.parents()
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
teach commit about dirstate.parents()
manifest hash:
89374a15a1e680a251f1a084c18136cb27ad2b42
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCoMOeywK+sNU5EO8RAj6rAJ9NBf0401gAlzA315m7gaEPeteaewCfe6A4
Bn3nm77acgIukB1ePfK1o1Y=
=P2y2
-----END PGP SIGNATURE-----
mpm@selenic.com [Fri, 03 Jun 2005 12:54:14 -0800] rev 228
teach rawcommit about dirstate.parents()
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
teach rawcommit about dirstate.parents()
manifest hash:
776f28b896f8de8c39c9edb0956faca78c1a827a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCoMN2ywK+sNU5EO8RAnJpAKCh5MVSMNlk1GRYPm7IOavhurYPLgCfYc9w
k4bTiV62lgoyItdmkynS1Jg=
=gVyk
-----END PGP SIGNATURE-----