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

Re: Copy changes from one branch to another

From: Thorsten Schöning <tschoening_at_am-soft.de>
Date: Mon, 30 Sep 2013 15:52:13 +0200

Guten Tag Sven Richter,
am Montag, 30. September 2013 um 14:53 schrieben Sie:

> Well, the way has come a long way and to reproduce it would take me a
> lot of time so i would please you and the others to just take it as
> given.

That implies that your description is the best or maybe even only
solution to your problem, what may be the case, but maybe more easier
things would work, too. We don't know, what we know is that there are
different possibilities to achieve your goal.

> Well, in case of our teams code base this is true. But our teams code
> base only makes up a small part of the whole trunk, so there are some
> dependencies (code and compiled libs) which are different in the two
> branches.
> And we do have to run tests against both branches to make sure it
> works with the different dependencies.
> Does that make sense?

This reads slightly different than how I understood your question in
the first way, I thought branch A is a replication of trunk, too. From
what it sounds like now I would try to version only those things in
branch A which a really needed because they are different than your
trunk-based test setup and use svn:externals to always pull in the
most recet code changes from trunk into a working copy to test based
on that. This will assure your to alwaays test with the latest changes
from trunk, while minimizing the need to merge something around, but
keeping you able to commit changes on branch A-specific libs,
configuration or whatever.

Mit freundlichen Grüßen,

Thorsten Schöning

Thorsten Schöning       E-Mail:Thorsten.Schoening_at_AM-SoFT.de
AM-SoFT IT-Systeme      http://www.AM-SoFT.de/
Telefon...........05151-  9468- 55
Fax...............05151-  9468- 88
Mobil..............0178-8 9468- 04
AM-SoFT GmbH IT-Systeme, Brandenburger Str. 7c, 31789 Hameln
AG Hannover HRB 207 694 - Geschäftsführer: Andreas Muchow
Received on 2013-09-30 15:52:50 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.