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

[Giovanni Bajo]

On 06/07/2007 3.02, Raman Gupta wrote:

> Attached is a patch to svnmerge.py that avoids property conflicts for
> both merged revisions (as per my prior patch) as well as blocked
> revisions. This patch obsoletes the one at http://tinyurl.com/3c229c.
> 
> The patch simply avoids conflicts be removing the integrated/blocked
> properties altogether before calling merge, and then resets them to
> their known values after the merge is complete.
> 
> Please use the earlier patch from Dustin (which was never committed)
> to test this code. It can be found here:
> 
> http://tinyurl.com/39bwwj

This patch is OK together with the testcase. Please commit both.

>  
>      # 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.
-- 
Giovanni Bajo