Branch Management for VULab

[Eric Dalquist]

I would recommend using the vendor-branch pattern: 
http://svnbook.red-bean.com/en/1.1/ch07s05.html This is used quite a bit 
do to what you describe and what many uPortal deployers do to track 
local modifications. It allows you to track what you have changed and 
also check in updated versions of your 'vendor' code and then merge your 
local changes with that updated version.

-Eric

David Makalsky wrote:
> Hi,
>
> The VULab team is looking to setup more rigorous branch management in 
> the fluid SVN repository.  We are facing an interesting challenge, 
> since our code is a modified version of a current open source 
> application, namely PHPESP 
> (http://butterfat.net/wiki/Projects/phpESP/).  Since there is no 
> plugin architecture or any form of structured modularity, we are going 
> right into the core code and making changes.  Colin suggested creating 
> a branch with the original PHPESP code and add our code to trunk.  
> This would allow for easy diff-ing and give some idea of which part of 
> the code is modified and which isn't.
>    
> I would appreciate some input from the rest of the VULab community on 
> this issue.
>
> Regards,
> -- 
> David Makalsky
>
>
>
> -- 
> David Makalsky
> ------------------------------------------------------------------------
>
> _______________________________________________
> fluid-work mailing list
> fluid-work at fluidproject.org
> http://fluidproject.org/mailman/listinfo/fluid-work
>   
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://fluidproject.org/pipermail/fluid-work/attachments/20080508/ced21b88/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/x-pkcs7-signature
Size: 3349 bytes
Desc: S/MIME Cryptographic Signature
URL: <http://fluidproject.org/pipermail/fluid-work/attachments/20080508/ced21b88/attachment.bin>