Re: cvs update

[Martin Jørgensen]

Jim Hyslop wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Martin Jørgensen wrote:
>
> > Actually I'm the only user on that project, but I'm working on several
> > machines... report.log is a file which is not important. I don't care
> > about that file (generated by latex).
>
> Then why are you keeping it in CVS? Log files are generally not useful
> items to keep version-controlled.
Windows drag-and-drop.

> > I thought committing meant: Merge my work. And updating meant: Get
> > changes since the last time and update all local files.
>
> No. Committing means "take what I have locally, and put an exact replica
> of this file into the repository."
>
> Merging is part of updating: "get any change from the repository, and if
> someone else has changed the file, incorporate their changes into mine."
Oh, finally I understand... So there's no way that update could create a 
new version on the server... I'm glad to hear that.
> > If I didn't delete this file report.log, how else could I manually fix
> > the problem with merging? It's giving me some kind of list (diff I
> > think) which I don't understand because I've never worked with diff
> > before...
>
> 'update -C' will fetch a fresh copy without merging. However, you should
> specify exactly which files to do this to, otherwise you could lose your
> local changes. Well, they won't be permanently lost: the original file
> will be renamed to the '.#' file name.
Very nice comments... It all makes sense suddenly. You know, most of the 
time I *want* to overwrite my local garbage... Actually I hate those .# 
filenames... Any way to avoid them, when I'm sure that I don't want them?
> Either that, or as I said, 'cvs remove' the log file and don't bother
> tracking it.
I was also interested in finding out how to resolve the conflict 
supposing that the file actually was important.... Something about this 
diff-utility, right?

Best regards / Med venlig hilsen
Martin Jørgensen

--
---------------------------------------------------------------------------
Home of Martin Jørgensen - http://www.martinjoergensen.dk