[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Repairing the elpa branch
From: |
Eli Zaretskii |
Subject: |
Re: Repairing the elpa branch |
Date: |
Tue, 15 Jan 2013 05:59:23 +0200 |
> From: Stefan Monnier <address@hidden>
> Cc: Chong Yidong <address@hidden>, Glenn Morris <address@hidden>,
> address@hidden
> Date: Mon, 14 Jan 2013 20:38:38 -0500
>
> >> > I think capturing those merges is important.
> >> > subsequent syncs with upstream are made more difficult if you use flat
> >> > commits.
> >> I think it is a matter of picking the lesser of two evils. Not being
> >> able to check out the branch at all (without a non-obvious workaround)
> >> seems to be much worse problem, compared with a bit of difficulty
> >> syncing with upstream. Since no one else has come up with a better
> >> solution, maybe we should go with Glenn's.
> > What about the alternative of using the fast-import plugin? The
> > following works for me with bzr 2.5.1 and 2.6b1:
>
> This loses the merge info.
How do you mean "loses"? After doing this, I still see all the merges
seen in the original branch, and as I wrote, "bzr log --include-merged"
looks the same, with 4 exceptions (that have nothing to do with
merges).
- Re: Repairing the elpa branch, (continued)
- Re: Repairing the elpa branch, Stefan Monnier, 2013/01/13
- Re: Repairing the elpa branch, Chong Yidong, 2013/01/13
- Re: Repairing the elpa branch, Eli Zaretskii, 2013/01/14
- Re: Repairing the elpa branch, Glenn Morris, 2013/01/14
- Re: Repairing the elpa branch, Eli Zaretskii, 2013/01/14
- Re: Repairing the elpa branch, Glenn Morris, 2013/01/14
- Re: Repairing the elpa branch, Eli Zaretskii, 2013/01/14
- Re: Repairing the elpa branch, Andreas Schwab, 2013/01/14
- Re: Repairing the elpa branch, Eli Zaretskii, 2013/01/14
- Re: Repairing the elpa branch, Stefan Monnier, 2013/01/14
- Re: Repairing the elpa branch,
Eli Zaretskii <=
- Re: Repairing the elpa branch, Stefan Monnier, 2013/01/14
- Re: Repairing the elpa branch, Andreas Schwab, 2013/01/15
- Re: Repairing the elpa branch, Stefan Monnier, 2013/01/15
- Re: Repairing the elpa branch, Stephen J. Turnbull, 2013/01/15
- Re: Repairing the elpa branch, Eli Zaretskii, 2013/01/15
- Re: Repairing the elpa branch, Glenn Morris, 2013/01/15
- Re: Repairing the elpa branch, Glenn Morris, 2013/01/15
- Re: Repairing the elpa branch, Eli Zaretskii, 2013/01/15
- Re: Repairing the elpa branch, Glenn Morris, 2013/01/15
- Re: Repairing the elpa branch, Stefan Monnier, 2013/01/15