Answering questions from Emacs developers.

[Ali Sabil]

On Tue, Dec 1, 2009 at 11:08 PM, Martin Albisetti <argentina at gmail.com> wrote:
> On Tue, Dec 1, 2009 at 6:58 PM, Karl Fogel <karl.fogel at canonical.com> wrote:
>> If anyone here wants to help out GNU Emacs as it switches to Bazaar, a
>> good way would be to answer Bazaar questions posted by Eli Zaretskii:
>>
>>  * "Listing branches with bzr"
>>    http://lists.gnu.org/archive/html/emacs-devel/2009-12/msg00021.html
>
> "bzr branches" is maybe what he's looking for.
>
>
>>  * "Strange response after merge from upstream"
>>    http://lists.gnu.org/archive/html/emacs-devel/2009-12/msg00023.html
>>
>>    (No response yet.  I think the answer to his question is "Yes,
>>    that's expected behavior, because you committed a merge", but it
>>    would be better if someone who knows Bazaar well could answer.)
>
> That's correct. The merge commit is an extra commit. It may or may not
> have changed anything, but it's an extra revision.
>

Maybe it would be good to explain in the wiki the difference between a
pull and a merge,
and maybe suggest the usage of bzr merge --pull instead of a plain bzr merge ?

--
Ali