[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Merge to trunk left added file in attic

From: Larry Jones
Subject: Re: Merge to trunk left added file in attic
Date: Sun, 16 Jun 2002 19:57:14 -0400 (EDT)

Ed Dunkle writes:
> After merging with the main trunk, a file I added is still in the
> attic.  Perhaps I merged incorrectly.

I believe that happens if you do another merge or update before
committing.  (You did commit after the merge, didn't you?)

> How do I get it on the main trunk now?

The simplest thing to do is to just move the RCS file from the Attic
diretory into the parent directory by hand.  If that's not possible,
you can delete the file and then resurrect it.

-Larry Jones

Honey, are we out of aspirin again? -- Calvin's Dad

reply via email to

[Prev in Thread] Current Thread [Next in Thread]