[prev in list] [next in list] [prev in thread] [next in thread] 

List:       koffice-devel
Subject:    Re: modifying local files
From:       Thomas Zander <zander () kde ! org>
Date:       2004-01-31 18:42:34
Message-ID: 200401311942.34973.zander () kde ! org
[Download RAW message or body]

If I remember correctly the answer is that cvsup does indeed do no merging.  
Beware of losing data!


On Saturday 31 January 2004 19:13, Raphael Langerhorst wrote:
> Hi all,
>
> sorry, this may be a stupid question. I had a look at the kde20 developer
> book and at the man page of cvsup. I think I know how it works with pure
> cvs, but I'm not sure about cvsup (which I recently set up for my KDE
> source tree).
>
> When I do local changes on some files (in a 'cvsup checkout') and do an
> update, are the local files replaced by the ones on the server - that is,
> are my local changes dismissed, or are these changed files kept until I
> manually (how? delete them?) tell cvsup to get the current version from the
> server.

-- 
Thomas Zander
_______________________________________________
koffice-devel mailing list
koffice-devel@mail.kde.org
https://mail.kde.org/mailman/listinfo/koffice-devel
[prev in list] [next in list] [prev in thread] [next in thread]