emacs-devel
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Merging emacs-23 into trunk

From: Óscar Fuentes
Subject: Re: Merging emacs-23 into trunk
Date: Wed, 10 Nov 2010 20:36:11 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) 
Eli Zaretskii <address@hidden> writes:

[snip]

> AFAIU, "-r A" is just a shorthand for "-r A..-1".  If A is an
> arbitrary revision on the branch being merged, you just cherry-pick
> all the revisions from A to the branch tip.

>From "bzr help merge":

> To merge changes up to and including revision 82 from bzr.dev:
>
>        bzr merge -r 82 ../bzr.dev

So it doesn't mean "from A", but "up to and including A".
reply via email to
[Prev in Thread] Current Thread [Next in Thread]