[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Merging emacs-23 into trunk
From: |
Eli Zaretskii |
Subject: |
Re: Merging emacs-23 into trunk |
Date: |
Thu, 11 Nov 2010 01:26:18 -0500 |
> From: Óscar Fuentes <address@hidden>
> Date: Wed, 10 Nov 2010 20:36:11 +0100
>
> 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".
Okay, but it's still cherry-picking of a certain range of revisions,
right?
- Re: Merging emacs-23 into trunk, (continued)
Re: Merging emacs-23 into trunk, Eli Zaretskii, 2010/11/10
- Re: Merging emacs-23 into trunk, Stefan Monnier, 2010/11/10
- Re: Merging emacs-23 into trunk, Eli Zaretskii, 2010/11/10
- Re: Merging emacs-23 into trunk, Stefan Monnier, 2010/11/10
- Re: Merging emacs-23 into trunk, Eli Zaretskii, 2010/11/10
- Re: Merging emacs-23 into trunk, Óscar Fuentes, 2010/11/10
- Re: Merging emacs-23 into trunk,
Eli Zaretskii <=
- Re: Merging emacs-23 into trunk, Óscar Fuentes, 2010/11/11
Re: Merging emacs-23 into trunk, Stephen J. Turnbull, 2010/11/10
Re: Merging emacs-23 into trunk, Eli Zaretskii, 2010/11/11
Re: Merging emacs-23 into trunk, Óscar Fuentes, 2010/11/10
Re: Merging emacs-23 into trunk, Stefan Monnier, 2010/11/11
Re: Merging emacs-23 into trunk, Óscar Fuentes, 2010/11/11
Message not availableRe: Merging emacs-23 into trunk, Óscar Fuentes, 2010/11/12
Re: Merging emacs-23 into trunk, Stefan Monnier, 2010/11/15