New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge multikey branch with trunk #677

Closed
robmcmullen opened this Issue Feb 21, 2012 · 2 comments

Comments

Projects
None yet
1 participant
@robmcmullen
Owner

robmcmullen commented Feb 21, 2012

[Trac time 20090605 170725Z] The multikey branch is currently undergoing final testing. This ticket is a placeholder for that merge into the main trunk.

@robmcmullen

This comment has been minimized.

Owner

robmcmullen commented Feb 21, 2012

[Trac time 20090609 002200Z] 8a4ed3e Fixed #677: merged r1975:[old svn rev2115] from multikey branch onto mainline

@robmcmullen

This comment has been minimized.

Owner

robmcmullen commented Feb 21, 2012

[Trac time 20090605 194042Z] Looks like git-svn can't handle this, so have to operate on an svn repository:

svn co http://svn.flipturn.org/peppy/trunk peppy-svn
svn merge -r 1975:HEAD http://svn.flipturn.org/peppy/branches/multikey

and then svn commit

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment