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

[Piet-Hein Peeters]

Hello,

I've tested the patch with the handling of transititive mergering property
conflicts.
The conflicts are 'resolved' correctly and the properties have the correct
value after the merge. However, the dir_conflicts.prej file is not deleted
which causes that svn status still detects a merge conflict and the commit
is blocked.

Regards,
Piet-Hein Peeters
Software Configuration Manager
HI / PII

Philips Medical Systems
Room QV-136
Veenpluis 4-6
5684 PC Best
The Netherlands

Tel: +31 40 2762016





                                                                           
                                                                           
                                                                           
                                                                        To 
                                       Raman Gupta                         
                                       <rocketraman at fastmail.fm>           
     Giovanni Bajo                                                      cc 
     <rasky at develer.com>               "svnmerge at orcaware.com"             
                                       <svnmerge at orcaware.com>             
     Sent by:                                                      Subject 
     svnmerge-bounces+pie              Re: [Svnmerge] [PATCH] Handle       
     t-hein.peeters=phili              transitive merging property         
     ps.com at orcaware.com               conflictsfor both merged/blocked    
                                       revs                                
     07/06/2007 08:24 AM                                    Classification 
                                                                           
                                                                           
                                                                           
                                                                           
                                                                           
                                                                           
                                                                           




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

Approved, thanks!
--
Giovanni Bajo

_______________________________________________
Svnmerge mailing list
Svnmerge at orcaware.com
http://www.orcaware.com/mailman/listinfo/svnmerge
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/svnmerge/attachments/20070713/407c0cff/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: graycol.gif
Type: image/gif
Size: 105 bytes
Desc: not available
URL: </pipermail/svnmerge/attachments/20070713/407c0cff/attachment-0006.gif>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: pic31182.gif
Type: image/gif
Size: 1255 bytes
Desc: not available
URL: </pipermail/svnmerge/attachments/20070713/407c0cff/attachment-0007.gif>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: ecblank.gif
Type: image/gif
Size: 45 bytes
Desc: not available
URL: </pipermail/svnmerge/attachments/20070713/407c0cff/attachment-0008.gif>