On 7/6/2007 8:07 AM, Raman Gupta wrote: >>> # Write out commit message if desired >>> if opts["commit-file"]: >>> @@ -1202,6 +1199,8 @@ >>> merged_revs = merged_revs | revs | reflected_revs | phantom_revs >>> branch_props[opts["source-path"]] = str(merged_revs) >>> set_merge_props(branch_dir, branch_props) >>> + # Reset the blocked revs >>> + set_block_props(branch_dir, old_block_props) >> Bonus points for a follow-up patch that moves the merge_props store to >> *before* the generation of the commit message. This allows to use CTRL+C to >> break the generation of the commit message, without leaving the working copy >> in an inconsistent state. > > Attached. > > [[[ > 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! -- Giovanni Bajo _______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
