[Svnmerge] [PATCH] Handle transitive merging property conflicts for both merged/blocked revs

[Raman Gupta]

Giovanni Bajo wrote:
> This patch is OK together with the testcase. Please commit both.

Thanks for the review Giovanni.

>>      # 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 <rocketraman at fastmail.fm>
Review by: ?
]]]

Cheers,
Raman
-------------- next part --------------
A non-text attachment was scrubbed...
Name: interrupt_merge_handling.patch
Type: text/x-patch
Size: 1388 bytes
Desc: not available
URL: </pipermail/svnmerge/attachments/20070706/4f82eb45/attachment-0002.bin>