Module Name:	pkgsrc
Committed By:	recht
Date:		Tue Dec 27 16:06:04 UTC 2005

Modified Files:
	pkgsrc/devel/ArX2: Makefile PLIST distinfo

Log Message:
update to 2.2.4

ArX-2.2.4 2005-Nov-16

"merge" now uses a three-way merge by default, with support for
external merge tools.  "merge" also now takes the --update option
instead of using heuristics.

"merge", "dopatch", and "replay" now record when there are conflicts
in the tree, and "commit" will refuse to act unless they are cleaned
up with "resolve".

The --silent, --quiet, --default-output, --report, and --verbose
options have been replaced with -v and -q options.

ArX is now much more clever when dealing with renames.

"commit" and "tag" now support --author and --date options.

The patch queue manager has been updated.

Some bugs when working across filesystems have been fixed.


To generate a diff of this commit:
cvs rdiff -r1.9 -r1.10 pkgsrc/devel/ArX2/Makefile
cvs rdiff -r1.1.1.1 -r1.2 pkgsrc/devel/ArX2/PLIST
cvs rdiff -r1.5 -r1.6 pkgsrc/devel/ArX2/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.