mpm@selenic.com [Fri, 10 Jun 2005 09:36:02 -0800] rev 305
more merge fixes
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
more merge fixes
Logic for getting a remote change should work going backwards and forwards
Mark all the changes in the merge that we don't get or merge so we
have the right list of files in the changeset
manifest hash: 88be742f510a2c58b276172ae538f9533f5e7491
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCqc+CywK+sNU5EO8RAjOKAJwNkC7phUO77IGW20R7MKyWBGP01gCgjxP6
K2CqUESHr2+0J96q3N74Siw=
=zb2f
-----END PGP SIGNATURE-----
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 10 Jun 2005 07:52:39 +0100] rev 304
Use vi if $EDITOR is unset.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 10 Jun 2005 07:50:20 +0100] rev 303
Check if $DISPLAY is set before using tkdiff or kdiff3.
mpm@selenic.com [Fri, 10 Jun 2005 00:29:36 -0800] rev 302
various fixups for git import
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
various fixups for git import
cache manifest flags properly after add
rawcommit
handle flags
handle multiple parents better
commit a complete manifest
verify
changesets and manifests are no longer necessarily 1:1
check for duplicate nodes
manifest hash: 5bf65f506d2b0da94d42d9fb1f792d58f6453c58
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCqU9wywK+sNU5EO8RApUUAJ9sXVIKMcmLChdk2M95U6DW37qNNQCgid08
/1E9Y4vw25HcxwJlXopV1lU=
=oohz
-----END PGP SIGNATURE-----
mpm@selenic.com [Fri, 10 Jun 2005 00:26:29 -0800] rev 301
revlog: allow duplicates
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
revlog: allow duplicates
If two branches make the same change to the same parent, the result
will be an identical hash. Git apparently does this all the time. Deal
with it gracefully.
manifest hash: c6217eab4b310e1ae529dd75ab90e717dbe5d55d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCqU61ywK+sNU5EO8RAkFqAJ9KhWUQgjZbzzB/+mTkolH0GkT1awCfa+Mj
ulbI4xCRZcvfQE492mcNwQA=
=N6In
-----END PGP SIGNATURE-----
mpm@selenic.com [Fri, 10 Jun 2005 00:25:04 -0800] rev 300
hg init: when hardlinking, remove dirstate
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
hg init: when hardlinking, remove dirstate
manifest hash: 48d32cdfe7eacf17b012226a884384e48377b0d8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCqU5gywK+sNU5EO8RAmzxAJ4hQUt/qrIcPzuGHf5dazJkKc9wgwCgpqV/
zSC4SHAvJQ2VptJSSVCEOAg=
=QVG+
-----END PGP SIGNATURE-----
mpm@selenic.com [Thu, 09 Jun 2005 09:48:50 -0800] rev 299
Merge with TAH
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Merge with TAH
manifest hash: 5a7d047acc6df6ba03db532657f54c0d38e4cffe
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD4DBQFCqIECywK+sNU5EO8RAg56AJ95hB6uw7Fc55XgwgZls4UUNRt1jACYrkrq
V9VJhhv29Fd/LEZy+ydoGQ==
=unEK
-----END PGP SIGNATURE-----
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 09 Jun 2005 09:24:08 +0100] rev 298
Turn on +x for every +r bit when making a file executable and obey umask.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 09 Jun 2005 08:53:07 +0100] rev 297
Fixed usage of removed variable 'wp'.
mpm@selenic.com [Thu, 09 Jun 2005 09:41:21 -0800] rev 296
hg update: fix clobbering files when going backwards
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
hg update: fix clobbering files when going backwards
spotted by Andrew Thompson
manifest hash: 0cfc2d189a395fb8761391d9918864034aa7a9b8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCqH9BywK+sNU5EO8RAoHrAJwN9Y2Jrvbdp/seTkGl6D/g1uxK0wCglZWz
jQ6F3A6ikzTXwhEq+KsR8Qw=
=9IPU
-----END PGP SIGNATURE-----