<<< Date Index >>>     <<< Thread Index >>>

Re: Multiple Patching



Hello,

> How do you multiple patch a source file when you can't successively
> patch it?

I am using bitkeeper[1] to handle this. There is one tree which tracks
CVS HEAD. Than I have one child-tree (clone) per feature. I import
upstream changes in there and fix conflicts on a per feature basis. This
also includes sometimes kicking the tree because the feature got
included upstream completely. And than I have a working repository where
I pull from all the features.

                        # # # # # # # # # # # #
                        # mutt cvs repository #
                        # # # # # # # # # # # #
                       /           |           \        (bk pull)
                      /            |            \
                # # # # # #   # # # # # #     # # # #
                # h-cache #   # cstatus #     # ... #
                # # # # # #   # # # # # #     # # # #
                    \              |             /
                     \             |            /       (bk pull)
                       # # # # # # # # # # # # #
                       #      my mutt tree     #
                       # # # # # # # # # # # # #

That way I can also report upstream on a per feature basis.

        Thomas [ who works with mail templates :-) ]

[1] BitKeeer
        http://www.bitmover.com/