Good morning,
we use subversion 1.4.4 in a windows environment to manage our natural
sources (IDE = natclipse - see
http://www.innowake.de/iw-software_2/index.php?loc=en&pid=2).
We develop one software product with several releases each year. For every
release we create a new branch.
The directory structure is (example with a natural main program source.nsp):
Version 2008-01:
D:\natclispe\projects\V200801\PRODCTNAME-V200801\src-natural\NatLib1\SubDir\
source.nsp
Version 2008-02:
D:\natclispe\projects\V200802\PRODCTNAME-V200802\src-natural\NatLib2\SubDir\
source.nsp
If I want to merge, the first problem will be that the directory names
differ.
So I've written a command script to solve this problem:
SET PATH=C:\tools\svn-win32-1.4.4\bin
CD /D D:\natclipse\projects\V200802\PRODCTNAME-V200802\src-natural\NatLib2
svn merge -r 2660:3284
http://srv-version/svn/PRODCTNAME/branches/V200801/PRODCTNAME/src-natural/Na
tLib1
D:\natclipse\projects\V200802\PRODCTNAME-V200802\src-natural\NatLib2 >
my_logfile
This script works quite okay, but we have several developers and everyone
should be able to merge his own objects. At the moment I'm the only one who
starts the merge and I've got nearly all the work to do.
This is what I want: We are able to identify all objects a developer has
changed in the old version ("200801") and that sould be merged into the new
version ("200802"). So I tryed a script with the whole path and with the
name of the source:
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
But unfortunately, merge does only work with directories and not with files.
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.
Kind regards,
Georg Blees
- Software Engineering -
Tel.: 069/61997-171 * Fax.: 069/61997-160 * E-Mail: blees_at_gipmbh.de
----------------------------------------------------------------------------
-
GIP Gesellschaft für innovative Personalwirtschaftssysteme mbH
Strahlenberger Str. 112
63067 Offenbach
Tel.: 069/61997-0
Fax.: 069/61997-160
E-Mail: gip_at_gipmbh.de
Web: www.gipmbh.de
Geschäftsführer: Ulf Buchholz * Vorsitzende des Aufsichtsrates: Andrea
Niemeyer
Amtsgericht Offenbach am Main * HRB 40469
----------------------------------------------------------------------------
-
---------------------------------------------------------------------
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-13 18:20:38 CEST