bashburn-info

[Bashburn-info] Need some merge help

[Steven W. O. <st...@sy...>]

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?

-- 
Time flies like the wind. Fruit flies like a banana. Stranger things have  .0.
happened but none stranger than this. Does your driver's license say Organ ..0
Donor?Black holes are where God divided by zero. Listen to me! We are all- 000
individuals! What if this weren't a hypothetical question?
steveo at syslang.net

Re: [Bashburn-info] Need some merge help

[Nick W. <ni...@uk...>]

On Mon, 15 Sep 2008 21:47:58 -0400 (EDT)
"Steven W. Orr" <st...@sy...> wrote:

> 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?
> 

Ummm. No :-D

I have never done that either.  I am nearly finished decorating, so
soon will have more time to get up to speed with all this.

BTW, if you use KDE, there is an excellent app called 'kdesvn' - I used
to use it a lot when I was on KDE, but the last year or so now I use
Fluxbox.

http://kdesvn.alwins-world.de/

Nick
-- 
Free Software Foundation Associate Member 5508

Re: [Bashburn-info] Need some merge help

[Steven W. O. <st...@sy...>]

On Tuesday, Sep 16th 2008 at 09:15 -0000, quoth Anders Lind?n:

=>What are you trying to merge? 
=>We don't want to merge unstable changes into the release branch.

No, the other way. I want to merge the changes in release/3.0 to trunk. I 
made changes in 3.0 which for better or for worse are now working and I 
wanted to get them into trunk before I continue working there.




=>
=>
=>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
=>

-- 
steveo at syslang dot net TMMP1 http://frambors.syslang.net/
Do you have neighbors who are not frambors? Steve Orr
Who should we vote for? http://steveo.syslang.net/electionrec-2008.5/

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

Re: [Bashburn-info] Need some merge help

[Steven W. O. <st...@sy...>]

On Thursday, Sep 18th 2008 at 16:39 -0000, quoth Anders Lind?n:

=>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. 

Anders, Thank you. Now I understand what my misteak was. I went for 531 
instead of 532. Now the error message makes sense too.

:-)

=>
=>
=>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?
=>> 


-- 
steveo at syslang dot net TMMP1 http://frambors.syslang.net/
Do you have neighbors who are not frambors? Steve Orr
Who should we vote for? http://steveo.syslang.net/electionrec-2008.5/