13 Commits

Author	SHA1	Message	Date
Matt Mackall	22c4273b99	filemerge: pull file-merging code into its own module	2008-02-03 19:29:05 -06:00
Brendan Cully	737a6eca37	imerge: add automerge flag to attempt to batch merge all conflicts	2007-08-23 22:45:41 -07:00
Brendan Cully	671f6fd2a7	imerge: fix ancestor calculation ... If wctx already has two parents, ancestor calculation is wrong. Normally merge is called before wctx gets the second parent, so we simulate this in imerge by temporarily popping the second parent before calling filemerge. Highly dirty. This patch also handles the ParseError move from cmdutil to dispatch.	2007-08-23 19:51:59 -07:00
Brendan Cully	f3948130fd	imerge: simplify c3b3184057da	2007-08-13 11:58:47 -07:00
Patrick Mezard	a7e536de52	imerge: fix status file lookups	2007-08-13 19:42:52 +02:00
Thomas Arendsen Hein	e34927453f	Remove trailing spaces, fix indentation	2007-08-07 10:28:43 +02:00
Brendan Cully	8b26a09d27	imerge: gussy up dispatcher to support subcommand opts. ... Add -n, --resolved, --unresolved to status.	2007-08-04 12:26:48 -07:00
Brendan Cully	6f2a9d642d	Merge with crew	2007-08-04 09:33:10 -07:00
Brendan Cully	9fa1148786	imerge: handle renames	2007-08-03 18:05:20 -07:00
Thomas Arendsen Hein	0dfe60884f	imerge: sorted() is only available in python2.4 and above	2007-08-02 14:04:51 +02:00
Benoit Boissinot	3588fd3abd	imerge: tarfile.extractall is only available in python2.5	2007-08-02 14:04:00 +02:00
Brendan Cully	a23047ab44	Update imerge for new filemerge interface	2007-08-01 23:59:19 -07:00
Brendan Cully	dbb657852c	imerge extension and test	2007-08-01 11:37:11 -07:00