On Tue, Jun 30, 2009 at 9:52 AM, Chris
Cannam<
cannam@...> wrote:
>>> Sorry. I was being a bit impatient ... boy it's slow! To say
>>> anything ... at all!
>>
> Yes, I read that second email as saying "don't worry about it, it's
> working, just about", so I didn't pile in with any suggestions either.
> But if you still need help, do say so.
It was running but I gave up after a couple of hours and the merge had
only got up to rev 9000 or so (should I have persevered?). From there
I got in a pickle with all future attempts falling over due to SSL
comms.
> Yeah, I don't mind doing them. In fact I'd be happy enough to simply
> merge the branch back to trunk for you now, if you like.
I'd like to learn to do them, so just the right commands would be a great help.
How do I merge all revisions from trunk version 10208 to HEAD into my branch?
When I used the command above, it was merging stuff from revisions in
the 6 and 7 thousands!
I'm then happy to go through and resolve any conflicts (shouldn't be much work).
Then how do I merge the newly up-to-date branch back into trunk?
------------------------------------------------------------------------------
_______________________________________________
Rosegarden-devel mailing list
Rosegarden-devel@... - use the link below to unsubscribe
https://lists.sourceforge.net/lists/listinfo/rosegarden-devel
