Fri, 22 Jul 2005 19:45:48 -0800 Get addremove to use new walk code.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 22 Jul 2005 19:45:48 -0800] rev 766
Get addremove to use new walk code. It is now more verbose than it used to be. If given file names, it prints nothing, as before. But if given patterns or nothing, it prints the names of the files it is operating on, to remove that air of mystery. It also now operates at or below the current directory.
Fri, 22 Jul 2005 20:07:14 -0500 Hack to fix missing '/' problem in URLs
mpm@selenic.com [Fri, 22 Jul 2005 20:07:14 -0500] rev 765
Hack to fix missing '/' problem in URLs
Fri, 22 Jul 2005 19:23:00 -0500 Don't mark files with 'm'erge unless we're actually merging branches
mpm@selenic.com [Fri, 22 Jul 2005 19:23:00 -0500] rev 764
Don't mark files with 'm'erge unless we're actually merging branches For 3-way merges, we were marking files as 'm', which should only be used for branch merges. This was causing files to show up in 'hg status' that aren't actually modified.
Fri, 22 Jul 2005 16:27:30 +0100 Added deprecation warnings if -t or --text is used for commits.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 22 Jul 2005 16:27:30 +0100] rev 763
Added deprecation warnings if -t or --text is used for commits.
Fri, 22 Jul 2005 16:26:46 +0100 Changed more occurances of 'text' to 'message'.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 22 Jul 2005 16:26:46 +0100] rev 762
Changed more occurances of 'text' to 'message'.
Fri, 22 Jul 2005 15:59:13 +0100 Change all references to -t --text commit message to -m and --message.
Andrew Thompson <andrewkt@aktzero.com> [Fri, 22 Jul 2005 15:59:13 +0100] rev 761
Change all references to -t --text commit message to -m and --message.
Fri, 22 Jul 2005 09:54:22 +0100 Changed coding hint to BOM
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 22 Jul 2005 09:54:22 +0100] rev 760
Changed coding hint to BOM
Fri, 22 Jul 2005 09:40:45 +0100 Updated TODO.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 22 Jul 2005 09:40:45 +0100] rev 759
Updated TODO.
Fri, 22 Jul 2005 08:58:16 +0100 There was an extra space after 'hg id' when there are no tags.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 22 Jul 2005 08:58:16 +0100] rev 758
There was an extra space after 'hg id' when there are no tags.
Fri, 22 Jul 2005 08:47:35 +0100 Updated help strings and test-help:
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 22 Jul 2005 08:47:35 +0100] rev 757
Updated help strings and test-help: - options -I/-X: always at the end, don't include them in the synopsis. - NAME is optional for hg revert - other small changes.
Fri, 22 Jul 2005 08:11:49 +0100 Added new code contributors, fixed Vincent's name, added hint on encoding.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 22 Jul 2005 08:11:49 +0100] rev 756
Added new code contributors, fixed Vincent's name, added hint on encoding.
Fri, 22 Jul 2005 07:42:47 +0100 Show filenames for hg export in verbose mode on a separate lines.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 22 Jul 2005 07:42:47 +0100] rev 755
Show filenames for hg export in verbose mode on a separate lines. This makes parsing by external tools much easier.
Fri, 22 Jul 2005 07:30:52 +0100 Fixes and cleanups to hgeditor:
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 22 Jul 2005 07:30:52 +0100] rev 754
Fixes and cleanups to hgeditor: - "HG: merge resolve" isn't supported for a long time now. - detection of unchanged commit message if signing is turned off. - don't add manifest hash to commit message if not signing.
Thu, 21 Jul 2005 18:20:13 -0500 Check protocol versions
mpm@selenic.com [Thu, 21 Jul 2005 18:20:13 -0500] rev 753
Check protocol versions This also allows the old unidentified protocol
Thu, 21 Jul 2005 18:19:20 -0500 Simplify content type checking
mpm@selenic.com [Thu, 21 Jul 2005 18:19:20 -0500] rev 752
Simplify content type checking
Thu, 21 Jul 2005 18:18:43 -0500 When pulling from a non hg repository URL (e.g. http://www.kernel.org/hg)
Muli Ben-Yehuda <mulix@mulix.org> [Thu, 21 Jul 2005 18:18:43 -0500] rev 751
When pulling from a non hg repository URL (e.g. http://www.kernel.org/hg) you geta pretty obscure error (zlib: uknown compression type). The attached patch modifies hgweb.py and hg.py to supply and check a 'Content-type: application/hg-0.1' HTTP header for the branches, between and changegroup commands, so that we know it's a proper hg repo before snarfing the input. Comments appreciated!
Thu, 21 Jul 2005 15:29:35 -0500 Add tag -t, deprecate tag -m
mpm@selenic.com [Thu, 21 Jul 2005 15:29:35 -0500] rev 750
Add tag -t, deprecate tag -m manifest hash: 893aa9732b500edfa6ffc099f76b00a88a5b1943
Thu, 21 Jul 2005 15:05:17 -0500 Update tests to use commit -m and default -u
mpm@selenic.com [Thu, 21 Jul 2005 15:05:17 -0500] rev 749
Update tests to use commit -m and default -u manifest hash: 6e4385453843031a712005a320d6000595b40d05
Thu, 21 Jul 2005 12:40:28 -0500 Update test output for status change
mpm@selenic.com [Thu, 21 Jul 2005 12:40:28 -0500] rev 748
Update test output for status change manifest hash: da9effa63afe6ec22389e17f7fc2daeb3bb4f0e0
Thu, 21 Jul 2005 12:29:19 -0500 Add -m for rawcommit
mpm@selenic.com [Thu, 21 Jul 2005 12:29:19 -0500] rev 747
Add -m for rawcommit manifest hash: cf066b609ab4854a731c103f1d456d89cf5e1312
Thu, 21 Jul 2005 12:24:42 -0500 Change C to M in status
mpm@selenic.com [Thu, 21 Jul 2005 12:24:42 -0500] rev 746
Change C to M in status
Thu, 21 Jul 2005 12:23:55 -0500 Add -m for commit and deprecate -t
mpm@selenic.com [Thu, 21 Jul 2005 12:23:55 -0500] rev 745
Add -m for commit and deprecate -t Index: hg/doc/hg.1.txt ===================================================================
Thu, 21 Jul 2005 12:22:54 -0500 Handle empty file list for annotate
mpm@selenic.com [Thu, 21 Jul 2005 12:22:54 -0500] rev 744
Handle empty file list for annotate
Thu, 21 Jul 2005 12:22:29 -0500 Remove ls command
mpm@selenic.com [Thu, 21 Jul 2005 12:22:29 -0500] rev 743
Remove ls command
Thu, 21 Jul 2005 12:21:33 -0500 Refactor matchpats and walk
mpm@selenic.com [Thu, 21 Jul 2005 12:21:33 -0500] rev 742
Refactor matchpats and walk Move core match function code to util Add some comments and whitespace Simplify options Use lambdas instead of always and never
Wed, 20 Jul 2005 20:11:23 -0500 Fix some line wrapping
mpm@selenic.com [Wed, 20 Jul 2005 20:11:23 -0500] rev 741
Fix some line wrapping manifest hash: 43af5dafa55e01f89727096f4d6784317f3eb0d6
Wed, 20 Jul 2005 20:00:29 -0500 Merge from BOS
mpm@selenic.com [Wed, 20 Jul 2005 20:00:29 -0500] rev 740
Merge from BOS manifest hash: 2276dbd96bb4221e579c871a1de2403c92c85659
Wed, 20 Jul 2005 04:08:11 -0800 Split make_file back out into make_filename and make_file.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 20 Jul 2005 04:08:11 -0800] rev 739
Split make_file back out into make_filename and make_file. It turns out that make_filename is useful by itself.
Wed, 20 Jul 2005 03:55:16 -0800 If the argument to make_file can act like a file, return it.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 20 Jul 2005 03:55:16 -0800] rev 738
If the argument to make_file can act like a file, return it. This is useful for code that calls command functions, but doesn't want to send I/O through the filesystem.
Wed, 20 Jul 2005 03:52:06 -0800 Merge with Matt's tip.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 20 Jul 2005 03:52:06 -0800] rev 737
Merge with Matt's tip.
Wed, 20 Jul 2005 03:43:05 -0800 Update tests to reflect walk changes.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 20 Jul 2005 03:43:05 -0800] rev 736
Update tests to reflect walk changes.
Wed, 20 Jul 2005 03:37:01 -0800 An empty .hgignore file must cause us to ignore nothing, not everything!
Bryan O'Sullivan <bos@serpentine.com> [Wed, 20 Jul 2005 03:37:01 -0800] rev 735
An empty .hgignore file must cause us to ignore nothing, not everything!
Wed, 20 Jul 2005 03:24:54 -0800 Update docs for annotate and diff.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 20 Jul 2005 03:24:54 -0800] rev 734
Update docs for annotate and diff.
Wed, 20 Jul 2005 03:23:12 -0800 Convert annotate over to walk interface.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 20 Jul 2005 03:23:12 -0800] rev 733
Convert annotate over to walk interface. Add emptyok parameter to walk and matchpats, for commands that require at least one name.
Wed, 20 Jul 2005 03:16:20 -0800 Convert diff command over to using walk code.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 20 Jul 2005 03:16:20 -0800] rev 732
Convert diff command over to using walk code.
Wed, 20 Jul 2005 03:01:23 -0800 Add name matching to status command.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 20 Jul 2005 03:01:23 -0800] rev 731
Add name matching to status command.
Wed, 20 Jul 2005 02:57:20 -0800 Only walk over files that match our criteria.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 20 Jul 2005 02:57:20 -0800] rev 730
Only walk over files that match our criteria.
Wed, 20 Jul 2005 02:48:16 -0800 Turn make_filename into make_file, which returns a file handle.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 20 Jul 2005 02:48:16 -0800] rev 729
Turn make_filename into make_file, which returns a file handle.
Tue, 19 Jul 2005 07:51:34 -0800 Fix typo.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 19 Jul 2005 07:51:34 -0800] rev 728
Fix typo.
Tue, 19 Jul 2005 07:42:36 -0800 Get commands to raise Abort instead of ui.warn(...),sys.exit(1).
Bryan O'Sullivan <bos@serpentine.com> [Tue, 19 Jul 2005 07:42:36 -0800] rev 727
Get commands to raise Abort instead of ui.warn(...),sys.exit(1).
Tue, 19 Jul 2005 07:15:59 -0800 Add a source designator to the walk methods.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 19 Jul 2005 07:15:59 -0800] rev 726
Add a source designator to the walk methods. If the source is 'f' (the filesystem), the file definitely exists in the filesystem. If 'm' (a rev or dirstate manifest), the file may not still exist with the given name.
Tue, 19 Jul 2005 07:00:03 -0800 Merge with Matt's tip.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 19 Jul 2005 07:00:03 -0800] rev 725
Merge with Matt's tip.
Mon, 18 Jul 2005 06:54:21 -0800 Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com> [Mon, 18 Jul 2005 06:54:21 -0800] rev 724
Get add and locate to use new repo and dirstate walk code. They use a walk function that abstracts out the irritating details, so that there's a higher likelihood of commands behaving uniformly.
Sat, 16 Jul 2005 15:13:40 -0800 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com> [Sat, 16 Jul 2005 15:13:40 -0800] rev 723
Work on walk code.
Wed, 20 Jul 2005 11:40:27 -0500 Add doc/Makefile to MANIFEST
mpm@selenic.com [Wed, 20 Jul 2005 11:40:27 -0500] rev 722
Add doc/Makefile to MANIFEST manifest hash: 1fc29da9334caa71ff8df55c52747f9c93df7e0f
Tue, 19 Jul 2005 15:09:04 -0500 Fix verify error reporting bug
mpm@selenic.com [Tue, 19 Jul 2005 15:09:04 -0500] rev 721
Fix verify error reporting bug Spotted by Chris Mason manifest hash: d5a6e5cb65d2de65a68d1f85c8692e79622844d3
Tue, 19 Jul 2005 12:41:08 -0500 Change hgit revision lookup to use repo.lookup
mason@suse.com [Tue, 19 Jul 2005 12:41:08 -0500] rev 720
Change hgit revision lookup to use repo.lookup
Tue, 19 Jul 2005 12:40:46 -0500 Fix hgit usage of repo.changes and fancyopts to reflect current hg api
mason@suse.com [Tue, 19 Jul 2005 12:40:46 -0500] rev 719
Fix hgit usage of repo.changes and fancyopts to reflect current hg api
Sun, 17 Jul 2005 08:39:44 +0100 Fix typos in FAQ
jdc@uwo.ca [Sun, 17 Jul 2005 08:39:44 +0100] rev 718
Fix typos in FAQ
Sat, 16 Jul 2005 17:25:05 +0100 Be even more specific with .hgignore regexps, added *.swp files.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 16 Jul 2005 17:25:05 +0100] rev 717
Be even more specific with .hgignore regexps, added *.swp files. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Be even more specific with .hgignore regexps, added *.swp files. manifest hash: 6664148b687983a41ef50d5bd4fd40426fb96621 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC2TThW7P1GVgWeRoRAhObAJ9ZuBxwCBSTZ9MSonw4q1EaluxMMQCfdrBo Czu2RdQEK4RZQh/ngzm73p8= =8XOM -----END PGP SIGNATURE-----
Sat, 16 Jul 2005 17:19:58 +0100 Fix up ignore regexps.
Bryan O'Sullivan <bos@serpentine.com> [Sat, 16 Jul 2005 17:19:58 +0100] rev 716
Fix up ignore regexps.
Sat, 16 Jul 2005 07:58:56 +0100 Make annotate use option --rev instead od --revision like other commands.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 16 Jul 2005 07:58:56 +0100] rev 715
Make annotate use option --rev instead od --revision like other commands. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Make annotate use option --rev instead od --revision like other commands. manifest hash: fe9c9cd9d42657f60d302b557f1f33640fd51199 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC2LAwW7P1GVgWeRoRAqYKAJ4tiLIVTRN0Ot6bjrEZRc9VFrk3zwCdGx/C PhOGWMHVlNYGZxmdXridIc4= =J7Cn -----END PGP SIGNATURE-----
Sat, 16 Jul 2005 07:56:39 +0100 Some cleanups in commands.annotate().
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 16 Jul 2005 07:56:39 +0100] rev 714
Some cleanups in commands.annotate(). -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Some cleanups in commands.annotate(). manifest hash: 9581ad3bb9ebc418e4772158c505e34b92496e92 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC2K+nW7P1GVgWeRoRAr3VAKCGvKbhmG4yweZTgmxIgaZlmz16HQCdFupq BKcWfEn17Y1l6IDbGS0rDyI= =/fR/ -----END PGP SIGNATURE-----
Fri, 15 Jul 2005 21:31:35 +0100 Added missing newline after two error messages.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 15 Jul 2005 21:31:35 +0100] rev 713
Added missing newline after two error messages. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Added missing newline after two error messages. manifest hash: c730cdf92c66ee5b44a4cd9b67f72deb844e4010 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC2B0mW7P1GVgWeRoRAjXJAJ48fbg6jXN65pBPGW/YmWn9OtKakACgjnr9 DPySaeLr3/bU7KhFdZPI7/4= =Lvsx -----END PGP SIGNATURE-----
Fri, 15 Jul 2005 13:42:19 +0100 Merge with myself.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 15 Jul 2005 13:42:19 +0100] rev 712
Merge with myself. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Merge with myself. manifest hash: e47e1ba87ecb28a08f819401fd8c2a88bc830261 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC168rW7P1GVgWeRoRAmknAJ0ea1BrnM1KSnfPqkYpurFpV+booACcDGNh ka6ciaH1pQLhOyKgqdbqwOA= =pOV4 -----END PGP SIGNATURE-----
Fri, 15 Jul 2005 12:17:03 +0100 Show filename for hg export in verbose mode.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 15 Jul 2005 12:17:03 +0100] rev 711
Show filename for hg export in verbose mode. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Show filename for hg export in verbose mode. manifest hash: 4fbb7bb566ef04e64079fb1fd61974ad47f22e7c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC15svW7P1GVgWeRoRAleQAJ4kXmyj+56kTb5lV9VrQYpu4O3h5ACfXU5W M0TB/OvU0g5uvudZVQMsJd0= =yq7Y -----END PGP SIGNATURE-----
Fri, 15 Jul 2005 12:06:29 +0100 Use dirstate to check if .hgtags needs to be added.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 15 Jul 2005 12:06:29 +0100] rev 710
Use dirstate to check if .hgtags needs to be added. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Use dirstate to check if .hgtags needs to be added. manifest hash: f90af1553754eb703fc457ffdd5ded0de6fa47e0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC15i1W7P1GVgWeRoRArDvAKCSxWDCbwU12ICwwVUoe753H8GYIwCfZGs0 HcL8cOp+eHz85AMJJE/xfck= =1xKK -----END PGP SIGNATURE-----
Fri, 15 Jul 2005 10:58:19 +0100 Fix synopsis: hg forget needs at least one file name.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 15 Jul 2005 10:58:19 +0100] rev 709
Fix synopsis: hg forget needs at least one file name. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix synopsis: hg forget needs at least one file name. manifest hash: 1386189a11f9bc539ae2c4bf93333235931d8bc6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC14i7W7P1GVgWeRoRAj3OAKCBPkYzoxOHu0Xp/vZ6Myz6JGM4hACgimU+ Gw1Av4ESM2ivORd8ulHMdBc= =kDiv -----END PGP SIGNATURE-----
Fri, 15 Jul 2005 10:07:55 +0100 Use changelogentry.tmpl for search results, too.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 15 Jul 2005 10:07:55 +0100] rev 708
Use changelogentry.tmpl for search results, too. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Use changelogentry.tmpl for search results, too. Since both are lists of changelog entries, they don't need to look different. This fixes a bug where only changelogentry was updated, but searchentry not. manifest hash: 9bfe7a3dd4512d3ee4e5538f369371bce6d55520 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC13zrW7P1GVgWeRoRAghNAJ9Agd+uPQ2iGdHAnjebr2R/RzAzUACdEyWq +yKY7wp16TD72ls6Q49LHJg= =9aSM -----END PGP SIGNATURE-----
Fri, 15 Jul 2005 09:38:57 +0100 Changed command synopsises to match style of common UNIX tools.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 15 Jul 2005 09:38:57 +0100] rev 707
Changed command synopsises to match style of common UNIX tools. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Changed command synopsises to match style of common UNIX tools. manifest hash: cf62235e46f5c06ac5a3c88cb61e9b57d35fe222 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC13YhW7P1GVgWeRoRAnSOAKCOtrYHZ2XMTjpphY/G2UZHcJcZeQCdFsgv D5Hu+s9ahVX8hns2ZbQpriI= =g6NW -----END PGP SIGNATURE-----
Fri, 15 Jul 2005 08:32:45 +0100 Make "hg parents REV" work (again?)
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 15 Jul 2005 08:32:45 +0100] rev 706
Make "hg parents REV" work (again?) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Make "hg parents REV" work (again?) manifest hash: d14db0d23b539ad0b754a51a83926d14f1be9a6e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC12adW7P1GVgWeRoRAtknAJ9TeUybLWYWY+Bi2b5grmAspgfemwCeP9cd 6mYSTWIsovCqW59KIrEvVVo= =u5nR -----END PGP SIGNATURE-----
Thu, 14 Jul 2005 22:56:55 -0800 Merge with TAH
mpm@selenic.com [Thu, 14 Jul 2005 22:56:55 -0800] rev 705
Merge with TAH manifest hash: 197e0d1a0d7376a9eb72381330462f06490ab821
Thu, 14 Jul 2005 22:51:47 +0100 Make makelock and readlock work on filesystems without symlink support.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 14 Jul 2005 22:51:47 +0100] rev 704
Make makelock and readlock work on filesystems without symlink support. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Make makelock and readlock work on filesystems without symlink support. This way you can have a repository on a fat partiton, e.g. a USB stick. manifest hash: cea2c120ef2b25a50c5d98b59648f773feefe470 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC1t5yW7P1GVgWeRoRAsKjAJ9BFcn/EqBK/dmJ4BY1pPIZIbDDJACghN3p VCQS6CJ72MHpzhOOsnOpHzE= =laDT -----END PGP SIGNATURE-----
Thu, 14 Jul 2005 17:28:19 +0100 merge program setting from hgrc wasn't used.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 14 Jul 2005 17:28:19 +0100] rev 703
merge program setting from hgrc wasn't used. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 merge program setting from hgrc wasn't used. manifest hash: 49da647e02534f51324a7a955a34c64c05bd8fa0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC1pKjW7P1GVgWeRoRAt6AAJ9ZB6NerDpWA/k2ZZeN6VUsSDkB8wCePhMd Xr+Tb86zo+xFhHq7YkDvLak= =+BY9 -----END PGP SIGNATURE-----
(0) -300 -100 -64 +64 +100 +300 +1000 +3000 +10000 +30000 tip