[Zope3-dev] package-includes query

Tim Peters tim at zope.com
Sat Jun 5 12:49:09 EDT 2004


[Tres Seaver]
> I just ran into this yesterday:
>
>    - I had moved a bunch of the "add-on" packages aside in
>      'package-includes', to verify that things still worked in
>      that case (e.g., I renamed 'pythonpage-configure.zcml' to
>      'pythonpage-configure.zcml.aside').  This was essentially
>      "policy" for my test site, and would be the natural way to
>      deactivate unwanted features.
>
>    - However, those files are under SVN, which means that I (or
>      somebody else) is likely either to check in such changes,
>      or else lose their policy choices, inadvertently.

Tres, I'm not really following this.  Did you use native OS commands to
move/rename the files, or SVN commands (like "svn move" or "svn rename")?
If you used native OS commands, you haven't changed anything so far as SVN
is concerned.

For example, on Windows:

C:\Code\Zope3>ren README.txt notREADME.txt # native Windows rename

C:\Code\Zope3>svn st  # says I'm missing README.txt
?      notREADME.txt
!      README.txt

C:\Code\Zope3>svn commit  # doesn't think I've changed anything

C:\Code\Zope3>svn up  # restores from the hidden local copy 
Restored 'README.txt'
At revision 25269.

C:\Code\Zope3>

If I had done "svn ren README.txt notREADME.txt" at the start, it would be
very different:

C:\Code\Zope3>svn ren README.txt notREADME.txt
A         notREADME.txt
D         README.txt

C:\Code\Zope3>dir/b *READ*
notREADME.txt

C:\Code\Zope3>svn st  # now svn thinks things really changed
A  +   notREADME.txt
D      README.txt

C:\Code\Zope3>svn revert -R .  # undo the damage locally
Reverted 'notREADME.txt'
Reverted 'README.txt'

C:\Code\Zope3>svn st  # but it didn't delete the local new file
?      notREADME.txt

C:\Code\Zope3>




More information about the Zope3-dev mailing list