Mark the usual things executable -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Mark the usual things executable manifest hash: e55dde46fd1a97ce338c1ac71278b67ca9d96bf7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpz5RywK+sNU5EO8RAnypAJwLpjrQ09nMSJUELtCondHI0fvuVACfQu2J mFi9D3L9ULGO457NWB4h3kY= =3bcD -----END PGP SIGNATURE-----

permissions merge: remove a debugging print -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 permissions merge: remove a debugging print manifest hash: 488144aeb1544ecc377ab41983e6cabd4a8b1f5f -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpz4KywK+sNU5EO8RAi+YAKCBmiiDkhe2ygCv4LF21RS3/iH0VgCeLwd5 c/yhTklZ9lnLWXy5dmuPNZk= =UtDf -----END PGP SIGNATURE-----

unidiff: handle empty diffs more gracefully -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 unidiff: handle empty diffs more gracefully manifest hash: e2030f7e55dc333ba0cd5b0847d1f1a08e3c5d64 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpz0uywK+sNU5EO8RAnt4AJ9pyaS6/xNnlhCUocq3m0HbCwHJ/gCgrP/H IvBJtq1eXvRedfitF25vBgw= =pd5n -----END PGP SIGNATURE-----

merge: update permissions even if file contents didn't change -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 merge: update permissions even if file contents didn't change manifest hash: f24ed7970c6ca48329a7aa9c2037d96333f7172e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpz0PywK+sNU5EO8RArOMAJ9CImCJMdubq5HsB3KrxOt1EG7PEgCgpPWg lnVxviZhv31EHtnxujQBoqM= =qxYq -----END PGP SIGNATURE-----

add tracking of execute permissions -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 add tracking of execute permissions Changes to executable permissions are now tracked. We only track one bit here as the others tends to be problematic. "hg manifest" now shows file permissions. manifest hash: b76b85d12a9550fdc9fbc4f9446a812f3a2bbe88 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpzYBywK+sNU5EO8RAgkMAJ48l2ac12E20EFS24/i8ScwOtG4HwCgkbaE ue6l1RJroqzNA7vNeqwCwK4= =sEmJ -----END PGP SIGNATURE-----

various merge improvements -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 various merge improvements add -C flag: force update and overwrite local changes add -m flag: allow merges with conflicts we no longer do merge by default and we print a warning message when the merge fails fix bug in printing merge failure message fix bug diffing files in 'm' state manifest hash: 75545a6db45d1e371082343d01c9f177df0f9db3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpm6tywK+sNU5EO8RAvb+AJ0euC3YkUYA944hds3ooPxbw6NpVwCfc1dj TiNsPIds560S5jgw44eWNto= =GPXN -----END PGP SIGNATURE-----

[PATCH] hgk should parse dates in the diff output -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] hgk should parse dates in the diff output hgk doesn't deal well with the difflib style diffs, it expects the filename to be the last thing on the line. This patch fixes the regexp to stop reading the filename at the first tab. Signed-off-by: Chris Mason <mason@suse.com> manifest hash: 9c5bcf427455dcf306ab6f91b1986723caa83f36 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpl/HywK+sNU5EO8RAgAjAKCOuZsRtJDbdurTQry+7krtLTtRQQCfXLuN LZEFkcOGS0jiAC6vci/RLJ0= =jkr1 -----END PGP SIGNATURE-----

merge: Fix bug where we overwrote local when local was newer -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 merge: Fix bug where we overwrote local when local was newer Spotted by Arun Sharma manifest hash: b81acb971c6471d95748cd349590cc70e448dce3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpl9oywK+sNU5EO8RAtseAJ92EEMovbVy0J1rFuxcGvED066m+ACfaWYF Q1/PcvkuH9aIqwMNkMK+aPU= =61JM -----END PGP SIGNATURE-----

diff: use tab to separate date from filename -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 diff: use tab to separate date from filename manifest hash: 73812de990e0e787320c11f7bd83c4ca91a52c4c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpdDxywK+sNU5EO8RAhKwAKCFcUa/p6ALbjoOl4I8VKJknZtu7gCdFvoE HQn1iq4gnJoeurB7YLMRpqc= =ltYP -----END PGP SIGNATURE-----

hgweb: ignore pipe errors -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgweb: ignore pipe errors manifest hash: 3a3baaa175a422bf499f414b5186ed551827db56 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpVkhywK+sNU5EO8RAo5aAJ9KPR/Gwp8YBswhyKqzVYVlgBl49ACghr65 sGKxB7ctoX9XB1WDht8WUzk= =J2bp -----END PGP SIGNATURE-----

Reverse order of hg log and hg history lists -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Reverse order of hg log and hg history lists Suggested by Arun Sharma manifest hash: 5f663a03e7ace601383c7291a17f83c9aeeccdda -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpVXDywK+sNU5EO8RApeOAJsFXG0qeO+yidIwyPrBHSmDMaKfdwCeMAWl uClUZxGNburRXmNLLAPHk9k= =1ytE -----END PGP SIGNATURE-----

hgweb: shrink the default changelog list to 10 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgweb: shrink the default changelog list to 10 manifest hash: 4d5f9f35b3dcb6bf05c0f25ab89cedba269ad924 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpVUbywK+sNU5EO8RAlmTAJ9HzQz9C1lmL22IGU0tXYDTLqcVAQCfTD1U pDF449wXA8ocjAF+UUJ7sL8= =YyBZ -----END PGP SIGNATURE-----