Re: Copy changes from one branch to another

2013-09-30 Thread Sven Richter
Hi, thank you all for your input. I guess we are on the right track now. Thinking about what you said we will go the different way, instead of committing to branch A, the testsystem that should use branch A will pull all changes from the trunk. If there is a merge error we can handle this manually

Re: Copy changes from one branch to another

2013-09-30 Thread Les Mikesell
On Mon, Sep 30, 2013 at 12:13 PM, Bob Archer wrote: >> >> But that has the effect that i will have all the changes from trunk in >> branch A, >> which is not what I want. I only want some certain changes inside there, the >> changes committed from our team. >> > > Common stuff should be brought i

Re: Copy changes from one branch to another

2013-09-30 Thread Rajesh Patwardhan
On 9/30/13 10:13 AM, "Bob Archer" wrote: >> On Mon, Sep 30, 2013 at 3:14 PM, Andrew Reedick >> wrote: >> > >> > Post commit script that deletes branch A and then recreates branch A >>from >> trunk, i.e. make branch A effectively a tag. Since the delete and copy >>are server >> side commands,

RE: Copy changes from one branch to another

2013-09-30 Thread Bob Archer
> On Mon, Sep 30, 2013 at 3:14 PM, Andrew Reedick > wrote: > > > > Post commit script that deletes branch A and then recreates branch A from > trunk, i.e. make branch A effectively a tag. Since the delete and copy are > server > side commands, no workspace is needed to make it work. However thi

RE: Copy changes from one branch to another

2013-09-30 Thread Bob Archer
> On Mon, Sep 30, 2013 at 2:45 PM, Grierson, David > wrote: > > Um ... why? > 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. > > > Wouldn't this mean that trunk and branch A are identical at all ti

RE: Copy changes from one branch to another

2013-09-30 Thread Andrew Reedick
> -Original Message- > From: Sven Richter [mailto:sver...@googlemail.com] > Sent: Monday, September 30, 2013 9:43 AM > To: users@subversion.apache.org > Subject: Re: Copy changes from one branch to another > > Hi, > > > > On Mon, Sep 30, 2013 at

Re: Copy changes from one branch to another

2013-09-30 Thread Thorsten Schöning
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 so

Re: Copy changes from one branch to another

2013-09-30 Thread Sven Richter
Hi, On Mon, Sep 30, 2013 at 3:14 PM, Andrew Reedick wrote: > > Post commit script that deletes branch A and then recreates branch A from > trunk, i.e. make branch A effectively a tag. Since the delete and copy are > server side commands, no workspace is needed to make it work. However this

RE: Copy changes from one branch to another

2013-09-30 Thread Andrew Reedick
> -Original Message- > From: Sven Richter [mailto:sver...@googlemail.com] > Sent: Monday, September 30, 2013 8:29 AM > To: users@subversion.apache.org > Subject: Copy changes from one branch to another > > Hi, > > I have the following setup > > trunk branch A (created from trunk) > |

Re: Copy changes from one branch to another

2013-09-30 Thread Sven Richter
Hi, On Mon, Sep 30, 2013 at 2:45 PM, Grierson, David wrote: > Um ... why? 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. > Wouldn't this mean that trunk and branch A are identical at all times - in

RE: Copy changes from one branch to another

2013-09-30 Thread Grierson, David
Um ... why? Wouldn't this mean that trunk and branch A are identical at all times - in which case what's the purpose of branch A over trunk? Dg. -- David Grierson - SDLC Tools Specialist Sky Broadcasting - Customer Business Systems - SDLC Tools Tel: +44 1506 325100 / Email: david.grier...@bskyb