Hello!
Anton Berezin wrote:
> On Tue, May 03, 2005 at 01:27:09PM +0400, Denis Peplin wrote:
>
>
>>The mergemaster with this is test patch (attached)
>>can auto-update files that was not modified.
>
>
> Please also see
>
> http://www.freebsd.org/cgi/getmsg.
Hello!
> There is one major problem here:
> This can be done in single-user mode only if your
> have local CVS repository, because if local CVS is
> not exist, anoncvs is used.
>
> Possible solutions:
There was some points that I missed:
> 1. Pre-checkout files in pre-buildworld mode.
pre-build
Hello!
Daniel O'Connor wrote:
>>>You don't need to download anything to start using etcmerge, you can just
>>>use the files from your last mergemaster.
>>
>>For etcmerge it is need to run mergemaster "one last time", or use
>>etc archive for some release. So if mergemaster will be improved,
>>it
Hello!
Daniel O'Connor wrote:
> On Fri, 6 May 2005 23:18, Denis Peplin wrote:
>
>>But for not modified files etcmerge is too complicated. Updating
>>for not modified files should be done in fully automated mode.
>
>
> hmm, but for unmodified files etcmerge doe
Hello!
Daniel O'Connor wrote:
> On Fri, 6 May 2005 20:18, Denis Peplin wrote:
> You know you can just use etcmerge to do this..
> It does a 3 way merge between your files and the old and new revisions.
>
> The only down side is that it's UI is totally unlike mergemas
Hello!
Juergen Unger wrote:
> On Tue, May 03, 2005 at 11:15:51AM -0700, Julian Elischer wrote:
>>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.
>
>
> so do I. And to go a step further: why
Hello!
Julian Elischer wrote:
> Mergemaster could keep checksums of known revisions.
>
> it wouldn't take much to have just one file with the last 35 checksums
> of each file. (maybe with the $FreeBSD$ line removed if it differs..)
Just implemented both variants (but second is not by count)
1. F
John Hay wrote:
> On Tue, May 03, 2005 at 01:27:09PM +0400, Denis Peplin wrote:
>>There is one major problem here:
>>This can be done in single-user mode only if your
>>have local CVS repository, because if local CVS is
>>not exist, anoncvs is used.
>>
>>
Hello!
The mergemaster with this is test patch (attached)
can auto-update files that was not modified.
It do this by compairing each file with it's CVS
copy. If file was not modified, it can be rewritten.
This dramatically redices amount of files that require
admin's attention.
There is one maj
9 matches
Mail list logo
