Hi Frank,
I know that cwsresync cannot detect everything. No automated tool can,
and knowing and understanding what you do instead of relying on
automatisms is always a good idea :)
However, Mathias seemed to suggest that cwsanalyze is able to detect
problems which are not detected by cwsresync. At least this is how I
understood his mail. And that's the part I don't understand.
I don't understand that, too. But, I have evidence that it is true.
I have a file that I branched from version 1.11 and did changes on on my
CWS. Current branch revision is 1.11.76.14 and the anchor tag after the
last resyncs (before hedaburemove01) is 1.14.
The HEAD is 1.15 and dead, i.e. the file was removed (moved, but from
cvs's point of view just removed), because of hedaburemove01.
Now, this is the output of cwsresync:
Resyncing 'inc/SchXMLExportHelper.hxx' remove file: removed, schedule
commit.
This is the output of cwsanalyze:
A inc/SchXMLExportHelper.hxx file removed on MWS but changed on CWS
M inc/SchXMLExportHelper.hxx 1.14 -> 1.11.76.14
I don't see why cwsresync should not be able to find out that the resync
will remove the file although there are commits on the branch.
With cwsanalyze I found a couple of files for which I would simply have
missed changes on the CWS without. So, I strongly recommend that
cwsresync alerts in this case. And I advise all people resyncing to >=
m210 to do a cwsanalyze to find out this kind of moved files.
-Bjoern
P.S.: moving files and modifying them at the same time (i.e. remove a
file and commit it with some changes at another place) is something that
is really bad to deal with with cvs. (That's what hedaburemove01 did.)
1. Check out the version of your anchor at place A (to some temp-file)
2. do a diff between this file and the new file at place B
3. Apply those changes to the file you changed on your branch at place A
4. copy the patched file to place B and commit it
5. remove the file at place A
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
