merging revisions into emacs24 from trunk

merging revisions into emacs24 from trunk

[Kelvin White]

Could someone point me in the right direction regarding
documentation or instruction on the correct way to merge
revisions from trunk into emacs-24 branch?

Thanks in advance

Re: merging revisions into emacs24 from trunk

[Eli Zaretskii]

> Date: Thu, 6 Nov 2014 09:49:03 -0500
> From: Kelvin White <kwhite@gnu.org>
> 
> Could someone point me in the right direction regarding
> documentation or instruction on the correct way to merge
> revisions from trunk into emacs-24 branch?

Take a look at admin/bzrmerge.el and respective notes in
admin/notes/repo.

Re: merging revisions into emacs24 from trunk

[Eli Zaretskii]

> Date: Thu, 6 Nov 2014 09:49:03 -0500
> From: Kelvin White <kwhite@gnu.org>
> 
> Could someone point me in the right direction regarding
> documentation or instruction on the correct way to merge
> revisions from trunk into emacs-24 branch?

Sorry, my previous reply was wrong; please ignore it.

Are you asking how to cherry-pick using bzr?  Because that's what you
need to do: cherry-pick the commits you want, then commit.  See
admin/notes/repo under 'Backporting a bug-fix from the trunk to a
branch (e.g. "emacs-24")'.

Re: merging revisions into emacs24 from trunk

[Stefan Monnier]

> Could someone point me in the right direction regarding
> documentation or instruction on the correct way to merge
> revisions from trunk into emacs-24 branch?

Just somehow get the change you want to backport (e.g. "bzr diff .. | patch"
or "bzr merge -r NN..MM" or even by hand) and commit it.  It's that simple.
The only trick is that the commit message should include the key word
"backport" somewhere so that bzrmerge.el will know to skip it to avoid
spurious merge conflicts when we try to merge emacs-24 back into trunk.


        Stefan

Re: merging revisions into emacs24 from trunk

[Kelvin White]

> Just somehow get the change you want to backport (e.g. "bzr diff .. | patch"
> or "bzr merge -r NN..MM" or even by hand) and commit it.  It's that simple.
> The only trick is that the commit message should include the key word
> "backport" somewhere so that bzrmerge.el will know to skip it to avoid
> spurious merge conflicts when we try to merge emacs-24 back into trunk.

I imagined it would be simple just wanted to make sure I didn't miss anything.
I tried the latter and had many conflicts, so I created a patch with bzr diff.
I will commit it shortly, thanks.