Re: Changes to emacs-23 branch and the trunk

[Eli Zaretskii]

> From: Kenichi Handa <address@hidden>
> Date: Tue, 31 Aug 2010 21:37:19 +0900
> Cc: address@hidden, address@hidden
> 
> In article <address@hidden>, Andreas Schwab <address@hidden> writes:
> 
> > You are probably confusing merge with cherry-pick.
> 
> Maybe.  Then which part was wrong with the procedure given
> by Stefan, and what is the correct procedure?
> 
> It seems that git has cherry-pick command but bzr doesn't
> (at least by that name).

You don't _want_ to cherry-pick in this case, because bzr does not
track cherry-picks in its history.  So cherry-picking would create
potential merge conflicts when Stefan or Chong will later merge from
the release branch.  Avoiding such conflicts was the motivation behind
the procedure suggested by Stefan.