[Top][All Lists]

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

Re: Attic headaches.

From: Kaz Kylheku
Subject: Re: Attic headaches.
Date: Thu, 23 Aug 2001 22:23:36 GMT
User-agent: slrn/ (Linux)

In article <address@hidden>, Larry Jones wrote:
>Kaz Kylheku writes:
>> When you are merging a file add from a branch to the main trunk,
>> such that the version file will move out of the Attic, if there is
>> some kind of commit failure, sometimes the move out of the Attic
>> is not properly rolled back. So the working copy is left pointing
>> to a nonexistent file in the repository. The solution is to
>> go into the repository and move the file back into the Attic.
>I don't understand what you mean by "the working copy is left pointing
>to a nonexistent file in the repository" -- there isn't anything I know
>of in a working directory that specifies whether a particular file is in
>the Attic or not.

Sorry. I mean that you get an error when you try the commit again, and
that error can only be fixed by going into the repository and moving
the file back into the Attic. Then the commit works. 

The last time this happened to me was because of a lock. Someone had
placed a lock on version 1.1.  But the file did not exist in the main
trunk; it was added on a branch. I merged and then tried to commit.
CVS choked on this file due to the lock, but left the version file
out of the Attic. I had to move the file back into the Attic manually,
remove the lock and then try the commit again, which worked fine.
Without moving it to the Attic first, it would not work.

reply via email to

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