This patch makes kdiff3 the default merge tool, instead of meld.
rationale:
Meld is nice on two-way merge, but much less satisfactory for three-way.
kdiff3 hasn't all the features of xxdiff, but is multiplatform (*nix,
win32, osx) and support editing the merged file!
As usual, comments
This patch adds a --msgfile=message file commit option. The named file
content is used as the commit message.
Rationale:
There is already MT/log, but for an automated tool getting the MT
directory is sometimes difficult. Besides, to use MT/log without
invoking the editor you need to define a lua
Joe Wilson wrote:
Which is considerably better than the 3.6 hours I experienced before.
Might I ask what compiler version, boost version and configure options
this version was built with?
MinGW, gcc 3.4, boost... I'd have to look. Probably 1.31.0, possibly
1.32.0. Certainly, building with 1.32
Timothy Brownawell writes:
It's trying to read MT/options.
I would be nice if there were a flag to tell Monotone to
_not_ read anything from the MT directory. Particularly,
when starting the Netsync server.
here's a patch to turn this into a warning.
Thank you!
Peter
I have just started using Monotone and I have a question or two. Firstly, it is
not as easy as I would hope to detect when new files are created and are not yet
under version control, i.e. monotone status does not list them, I need to use
list unknown - requiring at least two operations to get
Peter Simons wrote:
Timothy Brownawell writes:
It's trying to read MT/options.
I would be nice if there were a flag to tell Monotone to
_not_ read anything from the MT directory. Particularly,
when starting the Netsync server.
--root='.' should do limit the search for MT to the current
On Mon, May 09, 2005 at 08:29:53PM -0600, Derek Scherger wrote:
Peter Simons wrote:
Timothy Brownawell writes:
It's trying to read MT/options.
I would be nice if there were a flag to tell Monotone to
_not_ read anything from the MT directory. Particularly,
when starting the
On Mon, May 09, 2005 at 08:14:12AM +0200, rghetta wrote:
This patch adds a --msgfile=message file commit option. The named file
content is used as the commit message.
Two requests:
-- make it --message-file, I guess? Unless anyone else has a better
idea. It's a little verbose, but we
On Mon, May 09, 2005 at 07:52:03AM +0200, rghetta wrote:
This patch makes kdiff3 the default merge tool, instead of meld.
rationale:
Meld is nice on two-way merge, but much less satisfactory for three-way.
kdiff3 hasn't all the features of xxdiff, but is multiplatform (*nix,
win32, osx)
