[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Incorrect merge
From: |
Stefan Monnier |
Subject: |
Re: Incorrect merge |
Date: |
Tue, 02 Nov 2010 13:22:35 -0400 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) |
>>> In Python, they have a script called svnmerge.py. This script did
>>> many things, one of them was to keep track of blocked revisions, ie,
>>> revisions that should not be merged to trunk (or to some given branch,
>>> IIRC).
>> Indeed, the only way I can think of to try and make sure such undesired
>> merges don't happen is to try and encode this fact into a merge
>> script.
> The *only* way? What abut having a branch for that purpose?
It's difficult enough to make sure patches get installed in the right
(emacs-23 or trunk) branch and to keep them in sync, that adding another
branch would just add to the work.
Using an ad-hoc script on the other hand would *reduce* the work.
> BTW, do you realize that the script would end cherry-picking commits and
> that bzr has no support for tracking cherry-picks? This way it is not
> possible to easily track commits across branches.
Of course that would end up doing cherry-picking, so what?
We already do that by hand, so doing in from a script can't be worse.
Stefan
- Re: Incorrect merge, (continued)
- Re: Incorrect merge, Stephen J. Turnbull, 2010/11/03
- Re: Incorrect merge, Óscar Fuentes, 2010/11/03
- Re: Incorrect merge, Stephen J. Turnbull, 2010/11/03
- Re: Incorrect merge, Stefan Monnier, 2010/11/03
- Re: Incorrect merge, Lars Magne Ingebrigtsen, 2010/11/04
- Re: Incorrect merge, Andreas Schwab, 2010/11/05
- Re: Incorrect merge, Eli Zaretskii, 2010/11/05
- Re: Incorrect merge, Stefan Monnier, 2010/11/08
- Re: Incorrect merge, Óscar Fuentes, 2010/11/03
- Re: Incorrect merge, Stephen J. Turnbull, 2010/11/03
- Re: Incorrect merge,
Stefan Monnier <=
- Re: Incorrect merge, Óscar Fuentes, 2010/11/02
- Re: Incorrect merge, Eli Zaretskii, 2010/11/02
- Re: Incorrect merge, Óscar Fuentes, 2010/11/02
- Re: Incorrect merge, Stefan Monnier, 2010/11/02
- Re: Incorrect merge, Óscar Fuentes, 2010/11/01
- Re: Incorrect merge, Jason Rumney, 2010/11/01
- Re: Incorrect merge, Óscar Fuentes, 2010/11/02
- Re: Incorrect merge, Andreas Schwab, 2010/11/02
- Re: Incorrect merge, Óscar Fuentes, 2010/11/02
- Re: Incorrect merge, Stefan Monnier, 2010/11/02