Re: [Bashburn-info] Need some merge help

[Anders L. <and...@gm...>]

Ok, I merged what was changed in the release branch into trunk (I hope
it worked, scream if it didn't).

This is how I did it:

* Checked out wat which point release/3.0 was created with the log
command. Turns out it was at revision 532.

* cd into trunk and run the command: 

svn merge -r 532:HEAD
https://svn.inf.sgsp.edu.pl/svn/bashburn/releases/3.0


So, hopefully it all worked out and any changes that took place in 3.0
is now merged into trunk. 


mån 2008-09-15 klockan 21:47 -0400 skrev Steven W. Orr:
> In my own workspace, I
> 
> cd trunk
> I see that the release/3.0 branch was created on rev 531.
> I see that we're currently at 544.
> 
> 708 > svn merge -r 531:544 
> https://svn.inf.sgsp.edu.pl/svn/bashburn/release/3.0
> svn: REPORT request failed on '/svn/!svn/bc/544/bashburn/release/3.0'
> svn: '/svn/!svn/bc/544/bashburn/release/3.0' path not found
> 
> I also tried
> 
> 706 > svn merge -r 531:544 ../releases/3.0
> svn: Unable to find repository location for '../releases/3.0' in revision 531
> 
> Does anyone have a hint?
> 
-- 
Anders Lindén
http://bashburn.sf.net