Can bzr-svn merge be tracked by svn?

[Jelmer Vernooij]

Francis J. Lacoste wrote:
> On September 2, 2009, Jelmer Vernooij wrote:
>   
>> bzr-svn will only set these file properties, it will never try to
>> convert them back to revision parents in Bazaar since most merges in
>> Subversion are actually cherrypicks - and those can not be tracked in
>> bzr yet.
>>
>>     
>
> I don't know about the workflow specifics that the guy is using to know if he 
> was talking about cherrypicks? But I think he was actually talking about svn 
> merge, (does that qualify as a cherry-pick). 
>   
svn merge would be either full merges (e.g. "svn merge
http://host/some/path") or cherrypicks ("svn merge -r45
http://host/some/path"). Bazaar doesn't support tracking cherry pick
merges yet, so there's not much bzr-svn can do for cherrypicks.
> Since we don't read that property does it mean that if I used bzr-svn to get 
> the trunk and then merge the bzr branch that is already merged, bzr would re-
> attempt the merge?
>   
Bazaar also sets a Bazaar-specific svn revision properties with the
Bazaar revision parents; it can parse these properties again later.
Subversion will ignore these properties though.

Cheers,

Jelmer