That's more like what we do :)
Actually I was just troubled with the merge possibilities. I've started
to use the merge function recently, and at the same time discovered the
--reintegrate option with the feature branches.
I though maybe there could be something equivalent for release branches
Hi Jean,
The process we follow is as follows.
All changes & bugFixes are done from branch.
Trunk is used as a stable version.
Steps.
1) Create branch from trunk
2) Perform your change in the branch.
3) Merge changes from trunk to branch since the branch was taken. (A
change/bugFix could take se
On Mon, Jan 11, 2010 at 07:54:34PM +0100, Stein Somers wrote:
> On 11/01/2010 18:09, Tyler Roscoe wrote:
> >The usual way to do this is to make the bugfix on trunk and then
> >cherrypick merge the change from trunk up to your branch.
>
> Sure, in the early stages of the release process, but near o
On 11/01/2010 18:09, Tyler Roscoe wrote:
The usual way to do this is to make the bugfix on trunk and then
cherrypick merge the change from trunk up to your branch.
Sure, in the early stages of the release process, but near or past
D-day, as any decent CMM zero team we switch to panic mode. We
> On Mon, Jan 11, 2010 at 05:50:53PM +0800, Jean Seurin wrote:
> > In our process, we create a branch of a version that is going to
> be
> > released. Then we release from that branch and create a tag for
> each
> > released version.
>
> I assume you create the branch from the trunk?
>
> > The pr
On Mon, Jan 11, 2010 at 05:50:53PM +0800, Jean Seurin wrote:
> In our process, we create a branch of a version that is going to be
> released. Then we release from that branch and create a tag for each
> released version.
I assume you create the branch from the trunk?
> The problem lies in the
On Monday 11 January 2010, Jean Seurin wrote:
> I have to find a way to facilitate this bug porting from branch to trunk.
>
> Unfortunately I can't find any merge example made with this
> configuration. It seems it's designed to work the other way, trunk ->
> branch.
Subversion doesn't care about
