[cvsnt] Binary with Keywords
Ian Epperson
Ian at axiomdesign.com
Wed Aug 27 21:50:44 BST 2003
No, what I would want is a script that runs on each piece of code before the
merge - taking all the references and exchanging them for the actual names.
Then after the merge the script would reverse its steps, possibly
re-referencing new variables.
This would keep both changes.
__________
do
fork agent( smith );
repeat;
> -----Original Message-----
> From: Victor A. Wagner, Jr. [mailto:vawjr at rudbek.com]
> Sent: Wednesday, August 27, 2003 1:19 PM
> To: Ian Epperson
> Subject: RE: [cvsnt] Binary with Keywords
>
>
> while what you as MAY be doable (I'm sure I could write the
> code, but I'm
> NOT volunteering) you're now left with a situation where ONE
> of the changes
> is LOST. I'm not sure this is a step in the direction you want to go.
>
> At Wednesday 2003-08-27 10:08, you wrote:
> > > -----Original Message-----
> > > From: Glen Starrett [mailto:grstarrett at cox.net]
> > >
...truncated...
> >
> > > > Also, if I do build a script to handle this issue, is there
> > > > some way to have
> > > > it automatically run on the client or server for just this
> > > > file type before
> > > > and after a merge? Perhaps have it run for every commit
> > > (keeping the
> > > > mergable version in CVS) then re-translating it to a useful
> > > > version after
> > > > updates and merges?
> > >
> > > I would imagine you could set up a postcommit script,
> then just alter
> > > the appropriate files. Even if they aren't neatly in 1
> > > module then you
> > > could loop through the files committed and massage only
> the necessary
> > > ones.
> >
> >But I don't think there's a "pre-update" script. Because of
> this issue, I
> >may want to lobby form a "pre-merge" and "post-merge" script
> if possible.
> >However, don't the merges run on the client?
> >
> >
> > > Regards,
> > >
> > > Glen Starrett
> >
> >Thanks much!
> >_______________________________________________
> Victor A. Wagner Jr. http://rudbek.com
> The five most dangerous words in the English language:
> "There oughta be a law"
>
More information about the cvsnt
mailing list