[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 10:54:54 -0400 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) |
>> > 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).
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.
Having such a merge script is a good idea in any case since it can help
resolve the ChangeLog conflicts as well (they tend to require a lot of
work, but most of it can be automated).
Stefan
- 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, 2010/11/01
- Re: Incorrect merge,
Stefan Monnier <=
- 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
- Re: Incorrect merge, Stephen J. Turnbull, 2010/11/03