[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Merge tracking (cherry-pick) error in Svn ... looking for confirmation before filing a JIRA ticket.

From: Paul Hammant <phammant_at_hedgeserv.com>
Date: Tue, 7 Jun 2016 13:28:01 +0000

Except I filed the ticket instead of reading the ticket-filing instructions, so ‘before' really is ‘after' – oops:



   git clone https://github.com/paul-hammant/subversion_testing.git
   cd subversion_testing

Does this finished or choke on a merge conflict for you?

If the same scripts ported to Perforce, Git and Mercurial and the same sequence of events works fine. The code for those is on branches in that Git repo. I wrote blog entries too for the experience, but it’s probably not necessary to link to them here.

- Paul

Received on 2016-06-07 15:28:27 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.