Hi, On Tuesday, 2009-07-28 00:47:27 +0200, Mathias Bauer wrote:
> The problem was that I didn't call "svn clean" after "svn revert" and so > all files that had been added previously (in the failed merge) still > remained in my source tree, but not under version control (svn status > would have shown them with a "?" in front). The following merge caused > by the "successful" cws rebase was not able to add some of the new files > as they were already there, and so they did not enter my workspace and > wheren't committed to my CWS. > > I wonder why I never got the slightest warning, let alone an error > message, but anyway, I think the lesson learned is: > > Never forget to call "svn clean" after "svn revert". I just want to add to this: In my CWS I tested a fix that involved a new file. In that long time running CWS I forgot about it. The new file was added to trunk in the meantime, and when rebasing the CWS the new file was not added to the CWS for the same reason. A svn-clean would certainly had helped there, though I would expect at least a warning or even better a conflict in that situation. I had to manually checkout and add the file to the CWS, svn merge from .../tags/... failed with "Cannot replace a directory within", svn clearly sucked at that point. Eike -- OOo/SO Calc core developer. Number formatter stricken i18n transpositionizer. SunSign 0x87F8D412 : 2F58 5236 DB02 F335 8304 7D6C 65C9 F9B5 87F8 D412 OpenOffice.org Engineering at Sun: http://blogs.sun.com/GullFOSS Please don't send personal mail to the [email protected] account, which I use for mailing lists only and don't read from outside Sun. Use [email protected] Thanks.
pgpL8tpXDnFAR.pgp
Description: PGP signature
