Bruce Momjian wrote:
>
> My typical cycle is to take the patch, apply it to my tree, then cvs
> diff and look at the diff, adjust the source, and rerun until I like the
> diff and apply. How do I do that with this setup?
The most similar to what you're doing would be to
merge the patch's branch into yours. It's about
exactly the same amount of work as applying a
patch (a one liner if there are no conflicts).
From that point you could continue exactly as you are now - with the
additional benefit(?) that the checkin history of the branch should (I
hope) be preserved through the merge process so the SCM's history would
let you see which changes from the patch came from the submitter and which
changes came from the modifications in your tree.
(I think this SCM requirements list
http://changelog.complete.org/posts/528-Whose-Distributed-VCS-Is-The-Most-Distributed.htmlisone of the more
interesting.Thetwo features I like about the distributed systems are # 5. Branching preserves full history # 6.
Mergingpreserves full history.so the history of the branch (including which changescame from the submitter and which
weremodificationsin your tree) are preserved when they're eventuallycommitted to head.)