[jira] [Updated] (SVN-4635) Cherry-pick merge scenario causes Svn to choke

2018-02-18 Thread Paul Hammant (JIRA)

 [ 
https://issues.apache.org/jira/browse/SVN-4635?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Paul Hammant updated SVN-4635:
--
Affects Version/s: 1.10.x

> Cherry-pick merge scenario causes Svn to choke
> --
>
> Key: SVN-4635
> URL: https://issues.apache.org/jira/browse/SVN-4635
> Project: Subversion
>  Issue Type: Bug
>Affects Versions: 1.9.4, 1.9.5, 1.9.6, 1.10.x
>Reporter: Paul Hammant
>Priority: Major
>
> I've a shell script that allows for a repeatable series of merges between 
> branches that, when done cherry-pick style, with ultimately cause Svn to lose 
> context on what is merged and not merged.
> Scripts are here - https://github.com/paul-hammant/subversion_testing
> For fun, I ported the same scripts to Git, Mercurial and Perforce, and the 
> same loss of context doesn't happen for them in a repeated cherry-pick 
> situation.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)


[jira] [Updated] (SVN-4635) Cherry-pick merge scenario causes Svn to choke

2017-07-07 Thread Paul Hammant (JIRA)

 [ 
https://issues.apache.org/jira/browse/SVN-4635?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Paul Hammant updated SVN-4635:
--
Affects Version/s: 1.9.6

> Cherry-pick merge scenario causes Svn to choke
> --
>
> Key: SVN-4635
> URL: https://issues.apache.org/jira/browse/SVN-4635
> Project: Subversion
>  Issue Type: Bug
>Affects Versions: 1.9.4, 1.9.5, 1.9.6
>Reporter: Paul Hammant
>
> I've a shell script that allows for a repeatable series of merges between 
> branches that, when done cherry-pick style, with ultimately cause Svn to lose 
> context on what is merged and not merged.
> Scripts are here - https://github.com/paul-hammant/subversion_testing
> For fun, I ported the same scripts to Git, Mercurial and Perforce, and the 
> same loss of context doesn't happen for them in a repeated cherry-pick 
> situation.



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)