[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Confusing "bzr log" as result of merges
From: |
Eli Zaretskii |
Subject: |
Re: Confusing "bzr log" as result of merges |
Date: |
Sat, 21 May 2011 14:27:06 +0300 |
> From: Andreas Schwab <address@hidden>
> Cc: address@hidden
> Date: Sat, 21 May 2011 12:56:33 +0200
>
> Eli Zaretskii <address@hidden> writes:
>
> > On second thought, maybe it's my fault, in that I merged from trunk to
> > emacs-23, instead of just copying the code?
>
> The latter is exactly what you did. That's the essence of a
> cherry-pick.
Then how come bzr remembers those revisions I merged? Cherry-picks
are not tracked, right?
- Re: Confusing "bzr log" as result of merges, (continued)
- Re: Confusing "bzr log" as result of merges, Andreas Schwab, 2011/05/21
- Re: Confusing "bzr log" as result of merges, Eli Zaretskii, 2011/05/21
- Re: Confusing "bzr log" as result of merges, Andreas Schwab, 2011/05/21
- Re: Confusing "bzr log" as result of merges, Eli Zaretskii, 2011/05/21
- Re: Confusing "bzr log" as result of merges, Andreas Schwab, 2011/05/21
Re: Confusing "bzr log" as result of merges, Eli Zaretskii, 2011/05/21
Re: Confusing "bzr log" as result of merges, Sven Joachim, 2011/05/21
Re: Confusing "bzr log" as result of merges, Eli Zaretskii, 2011/05/21
- Re: Confusing "bzr log" as result of merges, Andreas Schwab, 2011/05/21
- Re: Confusing "bzr log" as result of merges, Eli Zaretskii, 2011/05/21
- Re: Confusing "bzr log" as result of merges, Andreas Schwab, 2011/05/21
- Re: Confusing "bzr log" as result of merges, Eli Zaretskii, 2011/05/21
- Re: Confusing "bzr log" as result of merges, Andreas Schwab, 2011/05/21
Re: Confusing "bzr log" as result of merges, Óscar Fuentes, 2011/05/21