Re: a unique merging problem

[Gobind Bansal]

----- Original Message -----
From: "Matthew Riechers" <address@hidden>
Cc: <address@hidden>
Sent: Tuesday, June 19, 2001 2:59 PM
Subject: Re: a unique merging problem


> > Gobind Bansal wrote:
> >
> > Hello,
> >
> > I have two copies of the same text document. I make changes at
> > different places in the two copies. Now I need
> > to update/integrate/merge the two copies into one.
>
> If one file is in a working directory (A) and the other isn't (B), just
> commit A, then copy B over A and commit, Else RTFM
>
> >
> > Can I use cvs for this purpose? I do not mind adding or changing some
> > cvs code... but unfortunately I am unaware as yet where to make
> > changes.
>
> I don't think your problem is big enough to do something that drastic.
> Am I missing something?
>

I think i had not made myself clear. i need this merging functionality only
as part of another bigger project where i have the text documents as return
values of some c++ functions. if i save the text as files i am loosing
efficiency. so i think i will have to use some cvs functions directly rather
than the cvs commands. do i clarify myself now? Any further help is greatly
appreciated.

> >
> > Another hassle is that the text document is in the form of strings and
> > not files.
>
> What does that mean?
>
> >
> > Any kind of help is awaited and appreciated
> >
> > Thanx
> >
> > gobind bansal
> > institute of information systems
> > eth zurich
> > switzerland
>