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

Re: [PATCH] filesystem location based auditing



On Mon, Feb 27, 2006 at 11:42:23AM -0500, Steve Grubb wrote:
> On Monday 27 February 2006 11:30, Amy Griffis wrote:
> > The last patch I posted was supposed to replace audit-string-2.patch
> 
> I must have missed that in the text somewhere...
> 
> > (as audit-watch.patch or something similar). ?I think if you used the
> > git tree ordering, you wouldn't see as many patch collisions.
> 
> At this point, your patch is the last one in, so shouldn't it should be 
> against what's already in the tree?  Its really a lot of trouble to
> take a change in a patch that's in the middle of the stack.

The patch I was updating was already present in both the audit.b1 and
master.b1 branches in the git tree.  I didn't see other options for
basing the patch, other than to branch off of the last commit prior to
the commit for this patch.

What is the preferred way to update a patch which has already been
merged?

Thanks,
Amy


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