RE: Branching/Merging Strategy

2012-02-21 Thread
> -Original Message- > From: leojhartiv [mailto:leo.h...@gmail.com] > Sent: Tuesday, February 21, 2012 11:49 AM > To: users@subversion.apache.org > Subject: RE: Branching/Merging Strategy > > > As a follow-up, strategy #2 seems to describe what my team is doing: &

RE: Branching/Merging Strategy

2012-02-21 Thread Bob Archer
--Original Message- > >> From: John Maher [mailto:jo...@rotair.com] > >> Sent: Monday, February 20, 2012 5:37 AM > >> To: Varnau, Steve (Seaquest R&D) > >> Subject: RE: Branching/Merging Strategy > >> > >> > >> Hello > >>

RE: Branching/Merging Strategy

2012-02-21 Thread leojhartiv
l Message- >>> From: John Maher [mailto:jo...@rotair.com] >>> Sent: Monday, February 20, 2012 5:37 AM >>> To: Varnau, Steve (Seaquest R&D) >>> Subject: RE: Branching/Merging Strategy >>> >>> >>> Hello >>> >>

RE: Branching/Merging Strategy

2012-02-21 Thread leojhartiv
ger development release? Varnau, Steve (Neoview) wrote: > >> -Original Message- >> From: John Maher [mailto:jo...@rotair.com] >> Sent: Monday, February 20, 2012 5:37 AM >> To: Varnau, Steve (Seaquest R&D) >> Subject: RE: Branching/Merging Strategy &g

RE: Branching/Merging Strategy

2012-02-20 Thread John Maher
Yes it was helpful. Thanks. -Original Message- From: Varnau, Steve (Seaquest R&D) [mailto:steve.var...@hp.com] Sent: Monday, February 20, 2012 12:40 PM To: John Maher Cc: users@subversion.apache.org Subject: RE: Branching/Merging Strategy > -Original Message- > From:

RE: Branching/Merging Strategy

2012-02-20 Thread
> -Original Message- > From: John Maher [mailto:jo...@rotair.com] > Sent: Monday, February 20, 2012 5:37 AM > To: Varnau, Steve (Seaquest R&D) > Subject: RE: Branching/Merging Strategy > > > Hello > > I'm new to subversion and have two questions.

RE: Branching/Merging Strategy

2012-02-19 Thread
> From: leojhartiv [mailto:leo.h...@gmail.com] > Sent: Saturday, February 18, 2012 8:36 AM > To: users@subversion.apache.org > Subject: Branching/Merging Strategy > > I wanted to describe our branching and merging strategy and hopefully get > some feedback. We are using

Branching/Merging Strategy

2012-02-18 Thread leojhartiv
I wanted to describe our branching and merging strategy and hopefully get some feedback.  We are using Subversion Server 1.6. Currently we manage trunk plus up to 3 other branches: trunk:  always represents "what's in production" 1.0.0, 2.0.0, etc: repr

RE: merging strategy

2010-02-17 Thread Srilakshmanan, Lakshman
fix. Hope this helps. Thanks Lakshman -Original Message- From: Philipp Leusmann [mailto:philipp.leusm...@rwth-aachen.de] Sent: Tuesday, 16 February 2010 6:51 AM To: users@subversion.apache.org Subject: merging strategy Hi all, we are currently rethinking our svn branching strategy and

Re: merging strategy

2010-02-17 Thread Rob van Oostrum
On Wed, Feb 17, 2010 at 11:18 AM, Philipp Leusmann < philipp.leusm...@rwth-aachen.de> wrote: > > Am 17.02.2010 um 16:46 schrieb Rob van Oostrum: > > On Wed, Feb 17, 2010 at 9:09 AM, Philipp Leusmann < > philipp.leusm...@rwth-aachen.de> wrote: > >> Thank for you hint, Bob, but I have doubts this wa

Re: merging strategy

2010-02-17 Thread Philipp Leusmann
Am 17.02.2010 um 16:46 schrieb Rob van Oostrum: > On Wed, Feb 17, 2010 at 9:09 AM, Philipp Leusmann > wrote: > Thank for you hint, Bob, but I have doubts this way a merging works out for > us, since we are working in a small team without "voting" each task. So, I > have the fear, that changes

Re: merging strategy

2010-02-17 Thread Rob van Oostrum
On Wed, Feb 17, 2010 at 9:09 AM, Philipp Leusmann < philipp.leusm...@rwth-aachen.de> wrote: > Thank for you hint, Bob, but I have doubts this way a merging works out for > us, since we are working in a small team without "voting" each task. So, I > have the fear, that changesets committed to trunk

Re: merging strategy

2010-02-17 Thread Philipp Leusmann
Thank for you hint, Bob, but I have doubts this way a merging works out for us, since we are working in a small team without "voting" each task. So, I have the fear, that changesets committed to trunk contain unrelated changes, which by accident make it into the branch. So, it would be nice to

RE: merging strategy

2010-02-15 Thread Bob Archer
> Hi all, > > we are currently rethinking our svn branching strategy and one question > came up. > > To explain what we are planning to do: > > We are going to use a release-branching, with adding new features to > /trunk . > At some point in time, we will create a ReleaseCandidate-branch from t

merging strategy

2010-02-15 Thread Philipp Leusmann
Hi all, we are currently rethinking our svn branching strategy and one question came up. To explain what we are planning to do: We are going to use a release-branching, with adding new features to /trunk . At some point in time, we will create a ReleaseCandidate-branch from the trunk to /branc