Comment 2 for bug 658395

Revision history for this message
Gerard Murphy (g-j-murphy) wrote : Re: bzr-svn crashes when attempting to commit local changes on checkout

More information, and a workaround:-

1. It appears that each attempt (I made several) to commit the local changes back up to Subversion was trying to recreate one of the pipeline stages referred to by the third branch.

2. The workaround was to define a fourth branch that was *not* a checkout, merge from the pipeline checkout (the 'third branch' referred to above) into the fourth branch, then to pull from the fourth branch on to the Subversion checkout - furthermore I could do this directly without using the '--local' option when pulling. This got my changes from the pipeline into both the Subversion checkout and the underlying Subversion branch.