On Fri, Jul 06, 2007 at 08:24:35AM +0200, Giovanni Bajo wrote:
> On 7/6/2007 8:07 AM, Raman Gupta wrote:
> > [[[
> > Move the post-merge merge_props and blocked_props update to *before*
> > the generation of the commit message. This allows a CTRL+C interrupt
> > to break the generation of the commit message, without leaving the
> > working copy in an inconsistent state. Requested by Giovanni Bajo.
> >
> > * contrib/client-side/svnmerge.py:
> > (action_merge): Move the commit log generation to the end of the
> > method.
> >
> > Patch by: Raman Gupta <[EMAIL PROTECTED]>
> > Review by: ?
> > ]]]
>
> Approved, thanks!
Committed in r25684.
Dustin
--
Dustin J. Mitchell
Storage Software Engineer, Zmanda, Inc.
http://www.zmanda.com/
_______________________________________________
Svnmerge mailing list
[email protected]
http://www.orcaware.com/mailman/listinfo/svnmerge
