Remy Blank wrote:
> osimons wrote:
>   
>> Very useful. Some further digging and I got this "in-a-nutshell" post:
>> http://jan.baresovi.cz/dr/en/subversion-mergeinfo
>>     
>
> Heh, pretty complicated stuff...
>
>   

Thanks for the link. Hopefully the svn book has a section on that as well.

>> +1 on propdel...
>>     
>
> Sounds reasonable. Go for it!
>   

Sure, this was a spurious side-effect, and I was puzzled as well as to 
why we got svn:merginfo property on that file.

More generally, I think that using svnmerge.py for merging changes from 
0.11-stable to trunk is still appropriate, until we eventually gain more 
confidence in the new mergeinfo command. We were anyway not using 
svnmerge.py for merges in other cases (the occasional trunk -> 
0.11-stable backport, sandbox/x -> trunk, trunk -> sandbox/x) and now 
when we use svn merge there, the svn:mergeinfo property gets added. So 
maybe we should see if we could take benefit from that... (see also the 
related posts from today on trac-users).

-- Christian


--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups "Trac 
Development" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to 
[email protected]
For more options, visit this group at 
http://groups.google.com/group/trac-dev?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to