Peter Wemm wrote:
>
> Doug Barton wrote:
> > Out of curiosity, what specifically do you not like about it? I realize
> > that not everyone is going to like/use it, but I am always interested in
> > ways to improve the program.
>
> I don't know about everyone else, but my main beef with it is that it
> doesn't use resources like cvs (when available) to do a smarter 3-way
> merge. It's got the version ID tags available so it could use that to
> extract the old unmodified version from cvs and use either rcsmerge or
> applying a patch generated by a diff of the old unmodied version and the
> current version.
>
> This is easier said than done though as the etc files are scattered all
> over the tree. :-/ However, when the path is available (ie: files with
> $FreeBSD$ rather than $Id$) then there is no guessing required.
This was the most requested feature at FreeBSDCon as well. I don't have
time to add that feature this week, but I will try to do it before the
release. I have looked at adding that, and it looks doable. Obviously
this feature would only be available for files that have $FreeBSD tags,
as I shudder to think what kind of a mess I'd be getting into otherwise.
However your diligent work on that issue should make my job much easier.
:)
Doug
--
"Welcome to the desert of the real."
- Laurence Fishburne as Morpheus, "The Matrix"
To Unsubscribe: send mail to [EMAIL PROTECTED]
with "unsubscribe freebsd-current" in the body of the message
