Error Merging Branch to Working Base

[rgf...@myactv.net]

I have a feature branch created and I would like to merge it with my working Base but I get an error each time I merge:

"URL http://xxx.xxx.xxx.xxx/svn/Crosby%20CMS/branches/Lite%201.1 is malformed or scheme or host or path is missing.

I'm not sure how I can fix this.

I'm using
TortoiseSVN 1.5.5, Build 14361 - 32 Bit , 2008/10/24 18:06:34
Subversion 1.5.4,
apr 1.2.12
apr-utils 1.2.12
berkeley db 4.4.20
neon 0.28.3
OpenSSL 0.9.8i 15 Sep 2008
zlib 1.2.3

Has anyone fixed this issue?

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=984235

To unsubscribe from this discussion, e-mail: [users-un...@tortoisesvn.tigris.org].

[Simon Large]

2008/12/15 <rgf...@myactv.net>:

> I have a feature branch created and I would like to merge it with my working Base but I get an error each time I merge:
>
> "URL http://xxx.xxx.xxx.xxx/svn/Crosby%20CMS/branches/Lite%201.1 is malformed or scheme or host or path is missing.

Wild guess: the '1' following the %20 makes it look like %201. If that
is the case then it is a bug because URI escapes require exactly 2 hex
digits after the %. In the meantime you can test this hypothesis using
"Lite%20%31.1" at the end of your URL.

Simon

--
: ___
: oo // \\ "De Chelonian Mobile"
: (_,\/ \_/ \ TortoiseSVN
: \ \_/_\_/> The coolest Interface to (Sub)Version Control
: /_/ \_\ http://tortoisesvn.net

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=984326

[postm...@tigris.org]

Simon
Thanks for your reply. That did not work. I still got the same error. What I did next was change the Lite 1.1 folder to Lite_1_1 to remove spaces. I got a different error this time

URL 'http://xxx.xxx.xxx.x​xx/svn/Crosby%20CMS/trunk/Crosby CMS Lite's malformed or scheme or host or path is missing.

So it doesnt see the Lite_1_1 as malformed but now it sees the trunk as malformed.

I tried renaming the trunk to remove spaces but then I get a "Target path does not exist" when doing an update.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=984465

[Stefan Kueng]

postm...@tigris.org wrote:
> Simon Thanks for your reply. That did not work. I still got the same
> error. What I did next was change the Lite 1.1 folder to Lite_1_1 to
> remove spaces. I got a different error this time
>
> URL 'http://xxx.xxx.xxx.x​xx/svn/Crosby%20CMS/trunk/Crosby CMS Lite's
> malformed or scheme or host or path is missing.
>
> So it doesnt see the Lite_1_1 as malformed but now it sees the trunk
> as malformed.
>
> I tried renaming the trunk to remove spaces but then I get a "Target
> path does not exist" when doing an update.

Since merging can be done in various ways: what exactly do you enter in
which dialog for your merge?

Stefan

--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=984466

[rgf...@myactv.net]

Hi Stephan. Here are the steps I follow

I have performed a Tortoisesvn -> switch and switched my working copy to my trunk.

From there I did a tortoisesvn -> merge. I selected reintegrate branch. My From URL is http://xxx.xxx.xxx.xx/svn/Crosby%20CMS/branches/Lite_1_1 and my working copy is my local disk location C:\documents and Settings etc... I then click next and select "Working Copy" as my merge depth and keep everything else as default.

When I do a test merge. I receive the error and then I receive the same error when I try the actual merge as well.

Thanks

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=984505

[Simon Large]

2008/12/15 <postm...@tigris.org>:

> Simon
> Thanks for your reply. That did not work. I still got the same error. What I did next was change the Lite 1.1 folder to Lite_1_1 to remove spaces. I got a different error this time
>
> URL 'http://xxx.xxx.xxx.xxx/svn/Crosby%20CMS/trunk/Crosby CMS Lite's malformed or scheme or host or path is missing.
>
> So it doesnt see the Lite_1_1 as malformed but now it sees the trunk as malformed.
>
> I tried renaming the trunk to remove spaces but then I get a "Target path does not exist" when doing an update.

There is an inconsistency there. You have /Crosby%20CMS/ (escaped) and
/Crosby CMS Lite/ (not escaped). Maybe there is some double escaping
going on somewhere. What do these paths look like in the repobrowser?

Simon

--
: ___
: oo // \\ "De Chelonian Mobile"
: (_,\/ \_/ \ TortoiseSVN
: \ \_/_\_/> The coolest Interface to (Sub)Version Control
: /_/ \_\ http://tortoisesvn.net

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=984515

[rgf...@myactv.net]

Here is what the path looks like in the repo-browser

http://xxx.xxx.xxx.xxx/svn/Crosby%20CMS/trunk/Crosby%20CMS%20Lite

It however does not look like that when I do a merge. The Crosby CMS Lite is not escaped whereas the Crosby%20CMS is escaped

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=984520

[Stefan Kueng]

rgf...@myactv.net wrote:
> Hi Stephan. Here are the steps I follow
>
> I have performed a Tortoisesvn -> switch and switched my working copy
> to my trunk.
>
> From there I did a tortoisesvn -> merge. I selected reintegrate
> branch. My From URL is
> http://xxx.xxx.xxx.xx/svn/Crosby%20CMS/branches/Lite_1_1 and my
> working copy is my local disk location C:\documents and Settings
> etc... I then click next and select "Working Copy" as my merge depth
> and keep everything else as default.
>
> When I do a test merge. I receive the error and then I receive the
> same error when I try the actual merge as well.

Can you try a merge "range of revisions" instead of a "reintegrate" and
specify the full revision range (start revision from where the branch
was created to HEAD)?
Reintegrating still has some quirks which should get fixed in svn 1.6.

Stefan

--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=984554