Re: A smarter mergemaster
From: Ashley Moran (work_at_ashleymoran.me.uk)
Date: 09/30/05
- Previous message: rashmi ns: "request:help reqd in using bus_dma functions"
- In reply to: Daniel O'Connor: "Re: A smarter mergemaster"
- Next in thread: Daniel O'Connor: "Re: A smarter mergemaster"
- Reply: Daniel O'Connor: "Re: A smarter mergemaster"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Date: Fri, 30 Sep 2005 09:53:42 +0100 To: freebsd-hackers@freebsd.org
Daniel O'Connor wrote:
> This work does look neat, but..
> Try etcmerge :)
> It's a bit of a pain to get started with it, but it is a *lot* faster (human
> input wise) than mergemaster. It only asks you about files that you have
> modified rather than ones that have been changed by committers (ie does a 3
> way merge).
>
> It does have problems handling DB files, but that is usually not a big problem
> to fix.
>
I read about etcmerge in BSD Hacks and there's been no going back for
me. It seems pretty stable even though it's not been updated for a good
while. Is there any chance it will ever make it into the FreeBSD core
system?
Ashley
_______________________________________________
freebsd-hackers@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-hackers
To unsubscribe, send any mail to "freebsd-hackers-unsubscribe@freebsd.org"
- Previous message: rashmi ns: "request:help reqd in using bus_dma functions"
- In reply to: Daniel O'Connor: "Re: A smarter mergemaster"
- Next in thread: Daniel O'Connor: "Re: A smarter mergemaster"
- Reply: Daniel O'Connor: "Re: A smarter mergemaster"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Relevant Pages
|
