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

Re: enhancement request: svn merge

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Wed, 15 Oct 2008 12:06:00 +0200

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-15 12:06:26 CEST

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