Re: Problems with cvswrappers MERGE directive

2003-02-25 Thread Larry Jones
Douglas Finkle writes [quoting me]: > > > > That is not currently possible. > > Can you please be more verbose? What more is there to say? The current code interprets -kb as COPY. There are no provisions for overriding it via wrappers. > Also, I guess I don't understand the > point of the MER

RE: Problems with cvswrappers MERGE directive

2003-02-25 Thread Douglas Finkle
> > I need to be able to provide the CVS server with a directive > > that forces a merge using the cvswrappers functionality, > > overriding CVS's default COPY behavior for files marked as '-kb'. > > That is not currently possible. Can you please be more verbose? Also, I guess I don't understand

Re: Problems with cvswrappers MERGE directive

2003-02-25 Thread Larry Jones
Douglas Finkle writes: > > I need to be able to provide the CVS server with a directive > that forces a merge using the cvswrappers functionality, > overriding CVS's default COPY behavior for files marked as '-kb'. That is not currently possible. -Larry Jones Fortunately, that was our plan from

Problems with cvswrappers MERGE directive

2003-02-24 Thread Douglas Finkle
I need to be able to provide the CVS server with a directive that forces a merge using the cvswrappers functionality, overriding CVS's default COPY behavior for files marked as '-kb'. Without adding complications of explaining our build process suffice it to say there is a requirement that all sou