[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: git transition issues
From: |
Eric S. Raymond |
Subject: |
Re: git transition issues |
Date: |
Fri, 31 Oct 2014 06:23:22 -0400 |
User-agent: |
Mutt/1.5.21 (2010-09-15) |
Eli Zaretskii <address@hidden>:
> > From: Stefan Monnier <address@hidden>
> > Date: Tue, 28 Oct 2014 20:58:33 -0400
> > Cc: address@hidden, address@hidden
> >
> > No, I think you're absolutely right. Maybe not all the changes need to
> > be backported, but many of them should. I recommend to backport
> > most/all of them as a single commit.
>
> I ended up backporting all of them, but in 3 different commits. A few
> unrelated commits were done in-between Eric's, and since bzr doesn't
> by default allow merging when there are uncommitted changes (and I
> didn't want to use --force to override that), I couldn't easily commit
> all the cherry-picked revisions in one go. But I think 3 is not that
> bad. (The 3rd one is Glenn's revert of one part of Eric's commits.)
Hm. Which target branch are we talking? Because I ported those changes
to the emacs-24 branch yesterday.
--
<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>
- Re: git transition issues, (continued)
- Re: git transition issues, Stefan Monnier, 2014/10/26
- Re: git transition issues, Eric S. Raymond, 2014/10/26
- Re: git transition issues, Stefan Monnier, 2014/10/27
- Re: git transition issues, Glenn Morris, 2014/10/28
- Re: git transition issues, Eric S. Raymond, 2014/10/28
- Re: git transition issues, Eli Zaretskii, 2014/10/28
- Re: git transition issues, Eric S. Raymond, 2014/10/28
- Re: git transition issues, Eli Zaretskii, 2014/10/28
- Re: git transition issues, Stefan Monnier, 2014/10/28
- Re: git transition issues, Eli Zaretskii, 2014/10/31
- Re: git transition issues,
Eric S. Raymond <=
- Re: git transition issues, Eli Zaretskii, 2014/10/31
- Re: git transition issues, Eric S. Raymond, 2014/10/31
- Re: git transition issues, Eli Zaretskii, 2014/10/31
- Re: git transition issues, Eric S. Raymond, 2014/10/31
- Re: git transition issues, Stephen J. Turnbull, 2014/10/31
Re: git transition issues, David Caldwell, 2014/10/26