Dangerous to keep re-integrated branches alive?

2011-02-11 Thread Varnau, Steve (Neoview)
Hi all, My development group uses quite a bit of branching. I'm trying to train folks to delete a task branch once it is integrated and create a new one for the next task. Of course the svnbook gives the recipe for "Keeping a reintegrated branch alive", by using a record-only merge to block the

Re: Dangerous to keep re-integrated branches alive?

2011-02-11 Thread Daniel Becroft
On Sat, Feb 12, 2011 at 1:10 PM, Varnau, Steve (Neoview) < steve.var...@hp.com> wrote: > Hi all, > > My development group uses quite a bit of branching. I’m trying to train > folks to delete a task branch once it is integrated and create a new one for > the next task. Of course the svnbook gives

Re: Dangerous to keep re-integrated branches alive?

2011-02-12 Thread Stefan Sperling
On Sat, Feb 12, 2011 at 04:08:26PM +1000, Daniel Becroft wrote: > On Sat, Feb 12, 2011 at 1:10 PM, Varnau, Steve (Neoview) < > steve.var...@hp.com> wrote: > > > Hi all, > > > > My development group uses quite a bit of branching. I’m trying to train > > folks to delete a task branch once it is int

RE: Dangerous to keep re-integrated branches alive?

2011-02-14 Thread Varnau, Steve (Neoview)
-Original Message- From: Stefan Sperling [mailto:s...@elego.de] Sent: Saturday, February 12, 2011 5:10 AM To: Daniel Becroft Cc: Varnau, Steve (Neoview); users@subversion.apache.org Subject: Re: Dangerous to keep re-integrated branches alive? On Sat, Feb 12, 2011 at 04:08:26PM +1000

Re: Dangerous to keep re-integrated branches alive?

2011-02-14 Thread Stefan Sperling
On Mon, Feb 14, 2011 at 05:41:03PM +, Varnau, Steve (Neoview) wrote: > > > -Original Message- > From: Stefan Sperling > Sent: Saturday, February 12, 2011 5:10 AM > To: Daniel Becroft > Cc: Varnau, Steve (Neoview); users@subversion.apache.org > Subject:

RE: Dangerous to keep re-integrated branches alive?

2011-02-14 Thread Varnau, Steve (Neoview)
> -Original Message- > From: Stefan Sperling [mailto:s...@elego.de] > Sent: Monday, February 14, 2011 9:54 AM > To: Varnau, Steve (Neoview) > Cc: Daniel Becroft; users@subversion.apache.org > Subject: Re: Dangerous to keep re-integrated branches alive? > > On Mo

Re: Dangerous to keep re-integrated branches alive?

2011-02-14 Thread Stefan Sperling
On Mon, Feb 14, 2011 at 06:05:26PM +, Varnau, Steve (Neoview) wrote: > > -Original Message- > > From: Stefan Sperling > > No, the files can differ. E.g. consider what happens if the branch modifies > > the very last line of a file. Now the branch is synced to trunk to prepare > > it for

RE: Dangerous to keep re-integrated branches alive?

2011-02-14 Thread Varnau, Steve (Neoview)
> -Original Message- > From: Stefan Sperling [mailto:s...@elego.de] > Sent: Monday, February 14, 2011 11:27 AM > To: Varnau, Steve (Neoview) > Cc: Daniel Becroft; users@subversion.apache.org > Subject: Re: Dangerous to keep re-integrated branches alive? > > On Mo