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

Re: How to maintain packaging files for multiple distributions in the same tree?

Manoj Srivastava <srivasta@debian.org> writes:

> On Thu, 01 Feb 2007 14:47:59 +0100, Goswin von Brederlow <brederlo@informatik.uni-tuebingen.de> said: 
>> If you had true parallel revisions then there should be a way to
>> edit both "branches" at the same time and check in changes to both
>> at the same time.
>         This is trivial using arch and bazaar-ng, and probably any
>  other modern distributed version control system. I can make
>  non-conflicting changes to multiple branches (think typo fixes), and
>  check them all in all at once.
>         manoj

That is not what I ment. You are taling about different changes for
each branch while I mean identical changes to the common parts of both
(all) branches.

What I have in mind is that you work on your local copy of the source
and then "foo commit" your changes. That then checks that the changes
apply to both branches and warns you about possible conflicts, for
example "Change of src/foo.c creates conflict for branch feature2".

The same would hold for a patch set where each patch is stacked on top
of all the others. If you edit the source at patchlevel 3 and then
commit the changes it would automatically check that patchlevels 4, 5,
6, ... still apply without conflict.


Reply to: