[Top][All Lists]

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

Re: Question regarding a filename in HEAD vs branch

From: Mark E. Hamilton
Subject: Re: Question regarding a filename in HEAD vs branch
Date: Mon, 24 Apr 2006 14:40:53 -0600
User-agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); en-US; rv:1.7.12) Gecko/20050920


Norman Crisp wrote:
A file was created in the main trunk called foo.GIF.  A branch was then
created call B4.  A designer noticed that the naming convention was
incorrect and the file should have been created as foo.gif.  So, the
designer physically deleted the file foo.GIF from CVS and created foo.gif.
In the main trunk all looks fine but when a checkout is done in the branch
we are still getting foo.GIF.

From the results you describe I'm assuming that your designer removed the file by doing a 'cvs -f remove foo.GIF' in a branch working directory, then did a 'cvs add foo.gif' in the same working directory. So, what you have is exactly as I would expect. The file foo.GIF doesn't exist in the branch because the developer removed it from the branch, but it still exists in the main trunk because it wasn't removed there. Conversely, the file foo.gif exists in the branch because that's where it was added, but it doesn't exist in the main trunk because it hasn't been added there yet.

IMO the simplest solution to this sort of problem would have been to just rename the foo.GIF,v file in the repository to foo.gif,v. This is normally not recommended since it alters the history of a project, but in the situation you describe it would be okay.

However, since you've already started down the path of removing one and adding another, what you can do is to create a main trunk project, add the file foo.gif there and remove foo.GIF. (You may need to copy the content into foo.gif, I'm not sure.)

Of course, you could also remove foo.GIF,v and foo.gif,v from the repository, re-create foo.gif and commit it from a main trunk project, and then branch it with B4. This assumes that no important changes or history would be lost by removing the ,v files. (Your description implies this would be the case.)

Mark E. Hamilton
Orion International Technologies, Inc.
Sandia National Laboratory, NM.

reply via email to

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