[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Incorrect merge
|
From: |
Stephen J. Turnbull |
|
Subject: |
Re: Incorrect merge |
|
Date: |
Tue, 02 Nov 2010 10:50:01 +0900 |
Juanma Barranquero writes:
> On Mon, Nov 1, 2010 at 21:37, Eli Zaretskii <address@hidden> wrote:
>
> > Suggestions are welcome.
>
> I don't think there are magic bullets.
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).
- Incorrect merge, Ken Brown, 2010/11/01
- Re: Incorrect merge, Chong Yidong, 2010/11/01
- Re: Incorrect merge, Chong Yidong, 2010/11/01
- Re: Incorrect merge, Eli Zaretskii, 2010/11/01
- Re: Incorrect merge, Juanma Barranquero, 2010/11/01
- Re: Incorrect merge, Eli Zaretskii, 2010/11/01
- Re: Incorrect merge, Juanma Barranquero, 2010/11/01
- Re: Incorrect merge,
Stephen J. Turnbull <=
- Re: Incorrect merge, Stefan Monnier, 2010/11/02
- Re: Incorrect merge, Óscar Fuentes, 2010/11/02
- Re: Incorrect merge, Stephen J. Turnbull, 2010/11/02
- Re: Incorrect merge, Óscar Fuentes, 2010/11/02
- Re: Incorrect merge, Stephen J. Turnbull, 2010/11/02
- Re: Incorrect merge, Óscar Fuentes, 2010/11/02
- Re: Incorrect merge, Stephen J. Turnbull, 2010/11/02
- Re: Incorrect merge, Óscar Fuentes, 2010/11/02
- Re: Incorrect merge, Stephen J. Turnbull, 2010/11/03
- Re: Incorrect merge, Óscar Fuentes, 2010/11/03