[Top][All Lists]

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

Re: cvs update

From: Jim Hyslop
Subject: Re: cvs update
Date: Wed, 01 Mar 2006 10:35:54 -0500
User-agent: Mozilla Thunderbird 1.0.6 (Windows/20050716)

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.

> 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."

> 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.

Either that, or as I said, 'cvs remove' the log file and don't bother
tracking it.

- --
Jim Hyslop
Dreampossible: Better software. Simply.
                 Consulting * Mentoring * Training in
    C/C++ * OOD * SW Development & Practices * Version Management
Version: GnuPG v1.4.2 (MingW32)
Comment: Using GnuPG with Thunderbird -


reply via email to

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