Hi, please see my comments inline.
Mathias Bauer wrote: > Moin, > > rumours are that some CWS have not survived a rebase with svn (at least > they weren't very useful afterwards) and in some cases the reason was > that files added on the master between the old and the new revision for > the CWS didn't make it into the merged CWS. > > I was successful ;-) in reproducing this behavior and at least in my > case the reason was as simple as easily avoidable: > > I wanted to rebase a CWS from DEV300_m49 to DEV300_m53 and due to the > huge amount and size of downloaded files my internet connection broke > before the "cws rebase -m" step finished. So I called "svn revert" to > start anew and then "successfully" got a merged CWS that I happily > committed. The shock came when the build broke due to missing files. > What had happened? > > 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". Just one comment here: It's "svn-clean", a script, written with a hyphen in the middle which can be used to remove untracked files. "svn clean" ist a shortcut for "svn cleanup", a svn commando to clean broken locks from the working tree after an interrupted write operation on the tree. So the sequence is: cd <working space> svn revert -R . svn-clean The script can be found in most SVN installations. > > I hope this will save others the time I have lost now (roughly a full > day to assemble the patch for my cws so that I can start from m53 > again). The good thing is that now the CWS is hosted with Mercurial. :-) > > Regards, > Mathias > Heiner -- Jens-Heiner Rechtien [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
