On Fri, 23 Jan 2004, Stas Bekman wrote: > Randy Kobes wrote: [ .. ] > > - if you change a file, and then do a 'cvs up', your > > edited file won't get replaced (that's indicated as such > > in the file listing coming from the command). If you do > > want to replace it, you have to remove it first. > > I don't understand this. Of course it won't get replaced. > If the file has changed in the repository since your last > 'cvs up' it'll merge the changes into the file (possibly > creating a conflict). if nothing has changed it won't do > anything. What's wrong with that?
I didn't mean to sound like it's a problem, but just something to be aware of. I mention it just because of these conflict messsages that can arise that may be confusing at first. The moral is to 'cvs up' before making changes to ensure you're working on the latest version. -- best regards, randy --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
