[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: merging revisions into emacs24 from trunk
|
From: |
Eli Zaretskii |
|
Subject: |
Re: merging revisions into emacs24 from trunk |
|
Date: |
Thu, 06 Nov 2014 18:34:58 +0200 |
> Date: Thu, 6 Nov 2014 09:49:03 -0500
> From: Kelvin White <address@hidden>
>
> 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")'.