[ale] Ooops - Moved some CVS files others have checked out.
John Mills
jmmills at telocity.com
Mon Aug 19 22:28:21 EDT 2002
Christopher -
On Mon, 19 Aug 2002, Christopher Fowler wrote:
> >From what I understand, CVS will not allow you to change the past. So
> be sure you do what you want to do. You may have to manually hack the
> CVS tree so these files can be edited.
No - I don't hack CVS's administrative files casually.
> The best way is for them to check out the new files. diff the old to
> the new, patch the new with the diff then update the repository.
I've done that to merge old and new filesets, putting a new 'HEAD'
revision onto an older tree I had brought in from MKS/Source Integrity,
but in which migration a number of files had shed their histories, and new
files had been added.
If my users can a check file back in which was removed since they checked
it out, this would simplify the problem because it would allow me to do
the patching on a Linux box, whereas most developers are working on
Window-boxes. (That's how the situation developed, I'm sure.)
> > First I renamed some files in CVS to correct naming and usage
> conventions:
> > <somedir>/YOYO.STRING
> > to:
> > <somedir>/YoYo.string
> > What's the smoothest way work through this situation.
- John Mills
---
This message has been sent through the ALE general discussion list.
See http://www.ale.org/mailing-lists.shtml for more info. Problems should be
sent to listmaster at ale dot org.
More information about the Ale
mailing list