AW: enhancement request: svn merge

Hello,

first of all:
Every file I want to merge is a text file. You'll find my example as
XBLMERGE.nsp which you can open with every text editor.

I tried to use special properties but without any success. See attachements
(merge_test.jpg and properties.jpg):

Error: PROPFIND request failed on
'/svn/kidicapp5/!svn/bc/4657/branches/V821/TOOLS/src-natural/K2MPX/XBLMERGE.
nsp'
Error:
'/svn/kidicapp5/!svn/bc/4657/branches/V821/TOOLS/src-natural/K2MPX/XBLMERGE.
nsp' path not found

If I try the url only as target, I'll receive:
Error: GET of
'/svn/kidicapp5/!svn/bc/4657/branches/V821/TOOLS/src-natural/K2MPX': 301
Moved Permanently (http://srv-version)

Kind regards

Georg Blees

-----Ursprüngliche Nachricht-----
Von: Jens Seidel [mailto:jensseidel_at_users.sf.net]
Gesendet: Freitag, 17. Oktober 2008 18:47
An: Blees, Georg
Cc: 'dev_at_subversion.tigris.org'
Betreff: Re: enhancement request: svn merge

On Fri, Oct 17, 2008 at 02:51:56PM +0200, Blees, Georg wrote:
> Here are some examples of real scripts, but they don't work. I've changed
> XBLMERGE.nsp in version V811 (source enviroment) and I want to merge this
> change into XBLMERGE.nsp of V821 (target). Revision 2230 is our copy
> revision - V821 was copied from V811.
>
> Example 1:
>
> CD /D D:\GiPclipse\projekte\V821\TOOLS-V821\src-natural\K2MPX
> svn merge -r 2230:HEAD
> D:\GiPclipse\projekte\V811\TOOLS-V811\src-natural\K2LPX\XBLMERGE.nsp
> D:\GiPclipse\projekte\V821\TOOLS-V821\src-natural\K2MPX\XBLMERGE.nsp
>
> ==> I sould use "--force", but this doesn't work. And svn says that the
> target path is not under version control.

Why don't you quote the error? The error message is probably wrong.

I'm very sure that you try to merge binary files, that's not supported.
If your file is indeed a text file set (or delete) a proper svn:mime-type
and svn:eol-style property.

See the Subversion book for details.

Jens

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org

• application/octet-stream attachment: XBLMERGE.nsp