On 6 September 2012 06:54, Richard Bown <[email protected]> wrote: > If course I'm also interested in this myself too because my R4Win updates are > still so infrequent that it annoys me I have to manually merge every time I > want to integrate latest.
The reason you have trouble merging is that you arsed about indiscriminately with the directory structure when you made your branch. That would probably be a slightly easier thing to maintain with a newer version control system than Subversion, but only if you had been using it when you branched in the first place. Chris ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Rosegarden-devel mailing list [email protected] - use the link below to unsubscribe https://lists.sourceforge.net/lists/listinfo/rosegarden-devel
