From: Asher Stern [mailto:aste...@gmail.com]
Sent: Wednesday, May 16, 2012 12:07 PM
To: Varnau, Steve (Seaquest R&D)
Cc: Stefan Sperling; Stephen Butler; users@subversion.apache.org
Subject: Re: Merge and record-only question
Hi.
Thank you all for your answers.
Yet, I am not sure a
aquest R&D)
> > -Original Message-
> > From: Stefan Sperling [mailto:s...@elego.de]
> > Sent: Wednesday, May 16, 2012 5:13 AM
> > To: Stephen Butler
> > Cc: Asher Stern; users@subversion.apache.org
> > Subject: Re: Merge and record-only question
> >
>
> -Original Message-
> From: Stefan Sperling [mailto:s...@elego.de]
> Sent: Wednesday, May 16, 2012 5:13 AM
> To: Stephen Butler
> Cc: Asher Stern; users@subversion.apache.org
> Subject: Re: Merge and record-only question
>
> On Wed, May 16, 2012 at 01:57:45PM +02
On Wed, May 16, 2012 at 01:57:45PM +0200, Stephen Butler wrote:
> I'd recommend doing cherrypicking merges from B to T.
I believe either of Asher's or Steven's suggestion would work fine.
If you go for the cherry-pick from B to T option, you might want to
block the resulting commits to T from bei
On May 16, 2012, at 12:42 , Asher Stern wrote:
>
> Hi.
>
> I have a question about merge, reintegrate and record-only.
>
> We use SVN version 1.6
>
> I am working on trunk, let's call it T.
> My colleague works on a branch (branched from trunk), let's call it B.
>
> We want to merge back, i.
Hi.
I have a question about merge, reintegrate and record-only.
We use SVN version 1.6
I am working on trunk, let's call it T.
My colleague works on a branch (branched from trunk), let's call it B.
We want to merge back, i.e., merge --reintegrate from B to T.
However, there are some changes in
