On Monday 27 February 2006 12:06, Amy Griffis wrote:
What is the preferred way to update a patch which has already been
merged?
In the past, we've applied patches on top of patches when they've been out for
some time. If its recent, like within a week, we've corrected patches since
there's not much that is counting on it being a certain way. An example,
we've got 2 patches against Dustin's patch that adds contexts to syscall
records.
Under normal circumstances this normally isn't a problem. Right now we have a
5 month backlog of patches that haven't gone upstream. That represents about
17-20 individual patches. Each patch added makes it more and more fragile to
changes that upstream is making.
The functionality that you just added, the audit client, really does stand on
its own. I don't think you need to merge it with the string2 patch.
-Steve