RE: Making branches

> As an example, Simon wants to work the treeview instead of tabs.
> He'll need to modify files in src and the resources.  So the 
> command he'll use is:
> 
>   scripts/makebranch.py /developer/skyjunky src resources

How do I merge changes from the trunk into my branch (and visa versa at some
point in the future), I'd like to merge in changes to reduce the merge task
later on.
I've tried to use the merge tool in tortoisesvn but it does not do anything
useful.

Simon



-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642