John Hay wrote:
etcmerge can already do this :)
Maybe, but last time I tried to use it, I got the feeling that it was
missing a front end. If its cleverness could be married to the ease
of use of mergemaster, we would have a winner. IMVHO
Yes, it is a little more difficult to use since it doesn't w
On Sat, May 14, 2005 at 08:49:17AM +0930, Daniel O'Connor wrote:
> Matthew D. Fuller wrote:
> >One thing that I'm pretty sure has been brought up before would be
> >that, for those of us who keep a local CVS repo mirror, it's easy and
> >pretty cheap to check out even arbitrary revs to compare to w
Matthew D. Fuller wrote:
One thing that I'm pretty sure has been brought up before would be
that, for those of us who keep a local CVS repo mirror, it's easy and
pretty cheap to check out even arbitrary revs to compare to what's
currently there (and if you wanted to be REALLY overly-smart, you
coul
On Fri, May 13, 2005 at 12:40:46PM +0400 I heard the voice of
Denis Peplin, and lo! it spake thus:
>
> > 2. Setup CVSup collection for subset of required files
> > (is it possible?), and then keep this small collection
> > up-to-date locally.
> src-etc cvs collection already here.
One thing that
Denis Peplin wrote:
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,
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.cgi?fetch=0+0+/usr/local/www/db/text/
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
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.cgi?fetch=0+0+/usr/local/www/db/text/2005/freebsd-audit/20050116.freebsd-audit
Doug
Date: Fri, 6 May 2005 22:20:43 +0930
From: Daniel O'Connor <[EMAIL PROTECTED]>
Subject: Re: mergemaster improvement (auto-update for not modified files)
To: freebsd-hackers@freebsd.org
Cc: [EMAIL PROTECTED]
Cc: Denis Peplin <[EMAIL PROTECTED]>
Cc
On Sat, 7 May 2005 00:15, Denis Peplin wrote:
> > Like I said before etcmerge's UI is not like mergemaster - it is much
> > more batch oriented.
>
> It is complicated for end-user to move from mergemaster to etcmerge
> (need to install new tool, read manual, perform some additional work...)
Maybe,
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 does nothing - you don't have to do
>
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 does nothing - you don't have to do
anything unless you want to edit the new fil
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 mergemaster so it can be
> a bit stra
On Fri, 6 May 2005 20:18, Denis Peplin wrote:
> 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..)
>
> Jus
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
> > >
> > > The technical reasons are very simple. If a new system call is
> > > created, and programs use that new system call, then if you do an
> > > installworld before you boot the kernel, that can result in binaries
> > > not working. This has happened with important ones like /bin/sh in
>
> On Wednesday 04 May 2005 06:38, M. Warner Losh wrote:
> >
> > The technical reasons are very simple. If a new system call is
> > created, and programs use that new system call, then if you do an
> > installworld before you boot the kernel, that can result in binaries
> > not working. This has h
On Wednesday 04 May 2005 06:38, M. Warner Losh wrote:
>
> The technical reasons are very simple. If a new system call is
> created, and programs use that new system call, then if you do an
> installworld before you boot the kernel, that can result in binaries
> not working. This has happened with
On Tue, 3 May 2005, 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
In message: <[EMAIL PROTECTED]>
Juergen Unger <[EMAIL PROTECTED]> writes:
: On Tue, May 03, 2005 at 11:15:51AM -0700, Julian Elischer wrote:
: > c0ldbyte wrote:
: [...]
: > >But with all due respect, This just seems like another case of a
: > >"Bike Shed" incident.
: > not at all.
: > I
On Tue, May 03, 2005 at 11:15:51AM -0700, Julian Elischer wrote:
> c0ldbyte wrote:
[...]
> >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 th
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
John Hay 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.
It do this by compairing each file with it's CVS
copy. If file was not modified, it can be rewritten.
This dramatically redic
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
On Tue, 3 May 2005, Denis Peplin wrote:
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 dra
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.
>>
>>Possible solutions:
>
>
> What about mer
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.
>
> It do this by compairing each file with it's CVS
> copy. If file was not modified, it can be rewritten.
>
> This dramatically re
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
29 matches
Mail list logo
