|
From: Joachim E. <joa...@gm...> - 2005-02-19 17:52:09
|
On Friday 18 February 2005 01:46, Craig Boland wrote: > I'm having trouble diffing two directories. This is > the command I'm using: > > kdiff3 dir1 dir2 -o diff.txt --auto > > My problem is that the GUI always appears. The result > displayed in the GUI is correct, though I can see 'Not > available' in the Type column of the right-hand pane > for 'Dest'. The output file (diff.txt) is never > created. I've tried other combinations of switches, > even setting the output (-o) to an existing directory, > but the result is always the same. Doesn't --auto > suppress the GUI? And why is diff.txt never created? > > What am I doing wrong? Hi, Currently the "--auto"-option is only intended for automatical file merge operation, but has no effect for directories. It would only work if you specify three input files (the first being the base). Otherwise the algorithm can't distinguish between solvable and unsolvable conflicts. Example: kdiff3 base.txt branch1.txt branch2.txt -o mergeresult.txt --auto I will improve the help info in that respect. But could you perhaps specify what kind of problem you want to solve? Perhaps it is solvable by some other way or with a future feature. Cheers, Joachim |