[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Incorrect merge

From: Óscar Fuentes
Subject: Re: Incorrect merge
Date: Tue, 02 Nov 2010 16:57:37 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux)

Stefan Monnier <address@hidden> writes:

>> 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?

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.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]