On 03/11/10 20:33, Garrett Cooper wrote:
> I've done a few RELENG_8_0 to STABLE-8 to 9-CURRENT upgrades lately
> and mergemaster was goofing up the contents a bit based on the RCS
> versions. I had to hand-edit a crapload of stuff going from 8 to 9,
> and I still don't trust mergemaster's automatic merging logic because
> it goofs up on /etc/group // /etc/passwd still (doesn't merge
> anything, discards my info, etc) for starters.
It would be really great if you could submit a proper bug report for
this. If there are underlying problems with mergemaster I want to fix them.
Meanwhile, mergemaster doesn't have an 'automatic merging logic' of its
own. It either uses mtree for the -U option, or sdiff if you merge by
hand. Without more information, it's hard to provide more useful
assistance.
> -a doesn't actually do any merging though, FWIW:
Thanks for helping the user with this information. :)
Doug
--
... and that's just a little bit of history repeating.
-- Propellerheads
Improve the effectiveness of your Internet presence with
a domain name makeover! http://SupersetSolutions.com/
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-stable
To unsubscribe, send any mail to "[email protected]"
