Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 03 May 2005 11:15:51 -0700
From:      Julian Elischer <julian@elischer.org>
To:        c0ldbyte <c0ldbyte@myrealbox.com>
Cc:        Denis Peplin <den@freebsd.org>
Subject:   Re: mergemaster improvement (auto-update for not modified files)
Message-ID:  <4277BFD7.2000508@elischer.org>
In-Reply-To: <20050503120958.Y42342@eleanor.us1.wmi.uvac.net>
References:  <427743ED.6020200@FreeBSD.org> <20050503120958.Y42342@eleanor.us1.wmi.uvac.net>

next in thread | previous in thread | raw e-mail | index | archive | help
c0ldbyte wrote:

>>
> 
> IMHO this isnt something that should be included with mergemaster due
> to the following things. 1). It should upgrade a file if the files cvs
> id doesnt match and provide you with a merge option, which it allready
> does both of those as it is now. 2). Only upgrading files that havent
> been changed is going to result in a positive false situation where
> the user actually thinks that his/her system has been fully upgraded
> and when in fact it hasnt, leaving added lines to files out where they
> should have been merged in. Preferably also IMHO this patch to
> mergemaster should be or would be better off renamed to another
> project and/or an option for people to compile into the system if they
> wish to have that kind of functionality. E.g: System/Addon for world
> through the use of a set variable in /etc/make.conf.local or something
> similiar.
> 
> But with all due respect, This just seems like another case of a
> "Bike Shed" incident.

not at all.
I've wanted this for a long time..
files that I have not touched are at default state and I wnat them to move to 
teh new default state. Files I have touched, I want to look at by hand.

> 
> Best regards to humor.
>         --c0ldbyte
> 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4277BFD7.2000508>