[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: cvs repository confusion
From: |
Edmund |
Subject: |
Re: cvs repository confusion |
Date: |
Fri, 05 Jul 2002 08:53:02 +0800 |
Eric Siegerman wrote:
> On Thu, Jul 04, 2002 at 09:06:16AM +0800, Edmund wrote:
> > I had created two different repositories for
> > the same project [apparently by accident]
> >
> > Is there a way to take the whole repository and compare it with
> > a different repository's source? Judging from the dates, I've
> > modified both repository code recently.
>
> You can diff the repositories themselves, but that's not likely
> to be too useful. The easiest would be if you were willing to
> sacrifice the revision history from one of your repositories, in
> exchange for getting the work you did there into the other one.
>
That might be a good start though. At least I know what I've
changed and possibly just modify the code in one repo and
do away with the other.
>
> I'll call the repository you're doing away with BAD, and the one
> you want to keep GOOD:
> - check out a new, fresh sandbox from GOOD; I'll call this
> GOOD-SB
[...]
>
> - resolve conflicts and commit
I think that's the best way of doing things. I suppose I'll
lose all those revision histories, right?
>
>
> > [...] there's
> > probably some feature that I'm missing and I'm still reading
> > the documentation.
>
> Nope. CVS was never intended to deal with this situation. The
> best thing to do is get yourself back to a single repo.
>
Yeah, tell me about it. After this incident, I'm going to have to
stick with a single repo.
Thanks Eric for the help!
Edmund