Re: how to update a directory recursive while not merge local modified file

[llf]

Yes, it would appear such situation, but it could be control, if compile fail, 
I then could merge file with my interfere, after all, auto merge may also bring 
conflict an lead to compile error, and in practice, clearcase everyday do such 
thing, and it is useful.
----- Original Message ----- 
From: "Jim Hyslop" <address@hidden>
To: "llf" <address@hidden>
Cc: <address@hidden>
Sent: Friday, March 03, 2006 11:57 AM
Subject: Re: how to update a directory recursive while not merge local modified 
file


> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> llf wrote:
>> 
>> I want to update a directory recursive, and those file that other
>> modified but I not modify should be updated, all those file that I
>> modified do not merge automaticly, how to do that?
> You can't. Not with CVS, with a single command, at least. You could
> specify each file to update, but that's a lot of work.
> 
>> Why I want to do that? because this action could simulate ClearCase's
>> dynamic view, those checkout file in clearcase(like modified file in
>> cvs) keep seperate from other's modify, those not checkout file in
>> clearcase(like checkout file but not modified in cvs) keep
>> synchronize with other's modify(I could update module every morning
>> in cvs use the way I asked), I think this is meaningful.
> I don't. I think that is actually a very bad idea.
> 
> Suppose I'm working on a C source file. Someone else modifies a
> different part of that file, plus a different file that I haven't
> modified, and checks in those changes. If I were to update using your
> scenario, I would only get half the changes made by the other person -
> and the chances are my program will no longer compile.
> 
> - --
> Jim Hyslop
> Dreampossible: Better software. Simply.     http://www.dreampossible.ca
>                 Consulting * Mentoring * Training in
>    C/C++ * OOD * SW Development & Practices * Version Management
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.2 (MingW32)
> Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
> 
> iD8DBQFEB76gLdDyDwyJw+MRAhSCAJ4rnqeh5o5X5OPO7PrDlFLvhYEhAgCgsKj5
> ukHAK85nzeMEH3FRPyCYZ30=
> =m1R7
> -----END PGP SIGNATURE-----
> 
>