In message <[email protected]> Steve Fryatt <[email protected]> wrote:
> 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. svnmerge was in use when svn itself didn't have any merge capabilities (pre v1.5 I believe) and shouldn't be use anymore. Cfr. svnbook at http://svnbook.red-bean.com/, more specifically http://svnbook.red-bean.com/nightly/en/svn.branchmerge.html John. -- John Tytgat [email protected]
