On 19 Dec, Michael Drake wrote in message
<[email protected]>:
> In the mean time, you can always do major changes on a branch any time you
> like, and then merge the branch to trunk.
That's probably the best plan.
As I've not done this before with NetSurf, can I just check the process (and
apologies if I've overlooked something on the website or Wiki)? Presumably
I can just create myself a named folder in the repository under branches/
and then take a copy of trunk/netsurf/ into that with a suitable name?
Thinking ahead slightly: what tools do you use to merge changes (from trunk
to branch or, ultimately, vice versa)? I tried experimenting on a local
copy of the old treeview branch a while back, and IIRC I found that it
didn't seem to work in the way I'm familiar with from within subversion.
Google lead me to svnmerge, but I wasn't sure if it was taking me in the
right direction or not.
--
Steve Fryatt - Leeds, England Wakefield Acorn & RISC OS Show
Saturday 16 April 2011
http://www.stevefryatt.org.uk/ http://www.wakefieldshow.org.uk/
