[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

AW: enhancement request: svn merge

From: Blees, Georg <Blees_at_gipmbh.de>
Date: Fri, 17 Oct 2008 14:51:56 +0200

Hello and thank you very much for your answer.

The two directories shown in my first mail are working copies.
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.

Example 2:

CD /D D:\GiPclipse\projekte\V821\TOOLS-V821\src-natural\K2MPX
svn merge
http://srv-version/svn/kidicapp5/branches/V811/TOOLS/src-natural/K2LPX/XBLME
RGE.nsp
http://srv-version/svn/kidicapp5/branches/V821/TOOLS/src-natural/K2MPX/XBLME
RGE.nsp D:\GiPclipse\projekte\V821\TOOLS-V821\src-natural\K2MPX\XBLMERGE.nsp

==> same result as in example 1

Example 3:

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
http://srv-version/svn/kidicapp5/branches/V821/TOOLS/src-natural/K2MPX/XBLME
RGE.nsp

==> cannot open path on srv-version (even with using XBLMERGE.nsp here)

I hope that I only used invalid merge syntax...

Kind regards

Georg Blees

-----Ursprüngliche Nachricht-----
Von: Julian Foad [mailto:julianfoad_at_btopenworld.com]
Gesendet: Mittwoch, 15. Oktober 2008 12:06
An: Blees, Georg
Cc: 'dev_at_subversion.tigris.org'
Betreff: Re: enhancement request: svn merge

Blees, Georg wrote:
> we use subversion 1.4.4 in a windows environment [...] For every
> release we create a new branch.
> The directory structure is (example with a natural main program
source.nsp):
[...]
> SET PATH=C:\tools\svn-win32-1.4.4\bin
> CD /D D:\natclipse\projects\V200802\PRODCTNAME-V200802\src-natural\NatLib2
> svn merge -r 3176:HEAD
>
>
D:\natclipse\projects\V200801\PRODCTNAME-V200801\src-natural\NatLib1\SubDir\
> source.nsp
>
>
D:\natclipse\projects\V200802\PRODCTNAME-V200802\src-natural\NatLib2\SubDir\
> source.nsp

What is the problem here? What happens, and what did you expect? Are
these two directories working copies or unversioned directories?

> But unfortunately, merge does only work with directories and not with
files.

No, merge works with files as well as directories.

> What about subversions possibilties in the future? Is it planned to
provide
> such a feature?
> I've posted my question to a germen subversion bulletin board but didn't
get
> any solution.

- Julian

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-10-17 18:14:27 CEST

This is an archived mail posted to the Subversion Dev mailing list.