Re: erratic commit records? (Shaun)



Thankyou very much for your helpful reply, Shaun :)

(My prospective son-in-law is named Shawn. Definitely a good omen, both ways. :) )

On 30/04/2005, at 10:41 AM, Shaun McCance wrote:

CVS doesn't clobber your local changes to files, unless you
manually pass it the -C option.  That would be a remarkably
dumb thing for version control software to do.  Instead, it
will attempt to merge your changes with the changes on the
server since the revision you checked out, which is pretty
much what you want it to do.

Uhuh.

But sometimes it just isn't smart enough to merge the changes together. It just uses trivial line diffs; it doesn't really know anything about the syntax of the files. So when it can't merge changes, it will print a 'C' before the filename in its output (an 'M' denotes a clean merge). And then it'll give a little message at the end telling you there are conflicts.

Yes, I've seen both of those.

Does this mean that I can simply commit without updating, even when there is quite a gap since checkout, and then

If this happens, you need to resolve the conflicts manually. This can be a real pain in the ass sometimes.

resolve any conflicts manually?

Thankyou very much for your help with this.Â

from Clytie (vi-VN, team/nhÃm Gnome-vi)

Clytie Siddall--Renmark, in the Riverland of South Australia

á thÃnh phá Renmark, tái mián sÃng cáa Nam Ãc

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