[cvsnt] Re: Strange behaviour when use commit whith '-e' option (Keep edited files)

Vladimir vab at borlas.ru
Wed Jan 25 14:46:10 GMT 2006


Hello Tony,

>> IMHO This makes commit option '-e' useless. Look. It is a real
>> situation when i do a serial of changes and after that "release" file
>> (notify other developers that i don't edit that file anymore). So i
>> have done many commits, but system persist that i lose my changes. And
>> more it revert my changes back (not in a repository but in a sandbox).
>> 
TH> Or, simply do standard commits followed by edit - which is friendler to
TH> others who may wish to work with the files.
Well Tony, i agree that standard commits is friendler but not in our
case when we shoud make changes in all branches at once, because
PowerBuilder scripts are not cleare text files, though are very
similar.

TH> On your last commit don't do '-e'.
Sory I install my version only some days ago but this problem was very
old. So I should test it again. You are right, all ALMOST work.
But look next to last "cvs status" command.

Anyway thank you very much.

--------------------------------------------------------------------------
M:\SANDBOX\TEST\HEAD\CVS_PBL_TEST\genapp2>cvs update
cvs server: Updating .

M:\SANDBOX\TEST\HEAD\CVS_PBL_TEST\genapp2>cvs edit d_test_zc.srd


M:\SANDBOX\TEST\HEAD\CVS_PBL_TEST\genapp2>cvs editors
d_test_zc.srd   vbogdanov       Wed Jan 25 14:20:33 2006 GMT    vab     M:\SANDBOX\TEST\HEAD\CVS_PBL_TEST\genapp2

Editing....

M:\SANDBOX\TEST\HEAD\CVS_PBL_TEST\genapp2>cvs commit -e
cvs.EXE commit: Examining .
Checking in d_test_zc.srd;
/TEST/CVS_PBL_TEST/genapp2/d_test_zc.srd,v  <--  d_test_zc.srd
new revision: 1.3; previous revision: 1.2
done

M:\SANDBOX\TEST\HEAD\CVS_PBL_TEST\genapp2>cvs editors
d_test_zc.srd   vbogdanov       Wed Jan 25 14:20:33 2006 GMT    vab     M:\SANDBOX\TEST\HEAD\CVS_PBL_TEST\genapp2

M:\SANDBOX\TEST\HEAD\CVS_PBL_TEST\genapp2>cvs status d_test_zc.srd
===================================================================
File: d_test_zc.srd     Status: Up-to-date

   Working revision:    1.3
   Repository revision: 1.3     /TEST/CVS_PBL_TEST/genapp2/d_test_zc.srd,v
   Expansion option:    kv
   Commit Identifier:   bec43d788f20fd6
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)
   Merge From:          (none)


Editing....


M:\SANDBOX\TEST\HEAD\CVS_PBL_TEST\genapp2>cvs commit -e
cvs.EXE commit: Examining .
Checking in d_test_zc.srd;
/TEST/CVS_PBL_TEST/genapp2/d_test_zc.srd,v  <--  d_test_zc.srd
new revision: 1.4; previous revision: 1.3
done

M:\SANDBOX\TEST\HEAD\CVS_PBL_TEST\genapp2>cvs status d_test_zc.srd
===================================================================
File: d_test_zc.srd     Status: Up-to-date

   Working revision:    1.4
   Repository revision: 1.4     /TEST/CVS_PBL_TEST/genapp2/d_test_zc.srd,v
   Expansion option:    kv
   Commit Identifier:   9d443d789241079
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)
   Merge From:          (none)

M:\SANDBOX\TEST\HEAD\CVS_PBL_TEST\genapp2>cvs editors
d_test_zc.srd   vbogdanov       Wed Jan 25 14:20:33 2006 GMT    vab     M:\SANDBOX\TEST\HEAD\CVS_PBL_TEST\genapp2

M:\SANDBOX\TEST\HEAD\CVS_PBL_TEST\genapp2>cvs unedit


M:\SANDBOX\TEST\HEAD\CVS_PBL_TEST\genapp2>cvs editors


M:\SANDBOX\TEST\HEAD\CVS_PBL_TEST\genapp2>cvs status d_test_zc.srd
===================================================================
File: d_test_zc.srd     Status: Needs Patch

   Working revision:    1.2 <---------------------------------------------
   Repository revision: 1.4     /TEST/CVS_PBL_TEST/genapp2/d_test_zc.srd,v
   Expansion option:    kv
   Commit Identifier:   9d443d789241079
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)
   Merge From:          (none)
   
M:\SANDBOX\TEST\HEAD\CVS_PBL_TEST\genapp2>cvs update
cvs server: Updating .
P d_test_zc.srd  <----------------------------------------------

M:\SANDBOX\TEST\HEAD\CVS_PBL_TEST\genapp2>cvs status d_test_zc.srd
===================================================================
File: d_test_zc.srd     Status: Up-to-date

   Working revision:    1.4
   Repository revision: 1.4     /TEST/CVS_PBL_TEST/genapp2/d_test_zc.srd,v
   Expansion option:    kv
   Commit Identifier:   9d443d789241079
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)
   Merge From:          (none)

M:\SANDBOX\TEST\HEAD\CVS_PBL_TEST\genapp2>cvs update
cvs server: Updating .

M:\SANDBOX\TEST\HEAD\CVS_PBL_TEST\genapp2>

-- 
Best regards,
 Vladimir                            mailto:vab at borlas.ru




More information about the cvsnt mailing list