Hi, On Saturday, 2011-09-10 21:00:40 +0200, Eike Rathke wrote:
> > Master DEV300, Release 3.4, Status nominated: > > impress212 DEV300m104 I stumbled over a few things in that CWS that needed extra care: It touched files under svtools/source/filter.vcl/filter/ That directory was renamed to svtools/source/filter/ later, so best works if patches touching them are edited to adapt the diff lines. It touched files under svtools/source/wmf/ that was moved to svtools/source/filter/wmf/ later, so again edit affected patches before applying. It removed files, if the original content doesn't match the current file's content the patch import complains about that, this needs to be dealt manually with git rm file ; stg refresh It created new files, these can be seen with stg status or git status and need to be added manually with git add files ; stg refresh Do not accidentally add the Makefile in the tree's root that is created by configure and set_soenv, and do not add the visibility.cxx and warn files that are leftovers from ./configure So, it's always a good idea to do a stg status before the next stg import. Eike -- PGP/OpenPGP/GnuPG encrypted mail preferred in all private communication. Key ID: 0x293C05FD - 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD
signature.asc
Description: Digital signature
