I'm at a loss to figure out how to get Git Svn to do the right thing here. I'm trying to commit some code to maint-5-2 (i.e., what will eventually be Tapestry 5.2.5).
$ git log commit 4e481871aff0127e4616d99236a27dcebac7b4ca Author: Howard M. Lewis Ship <[email protected]> Date: Fri Feb 11 03:34:54 2011 -0800 TAP5-1208: Shadow FieldConduit values to the adapted field when in development mode commit 9e89c553d38de74234d4889474bdbba025895765 Author: Howard M. Lewis Ship <[email protected]> Date: Fri Jan 7 17:43:52 2011 -0800 TAP5-1372: Add Request.getServerPort() and change BaseURLSourceImpl() to use it. commit 3c04eb94c9a54c9959dbb4acbaa192f52ae8a00c Author: Howard Lewis Ship <[email protected]> Date: Mon Nov 15 17:32:39 2010 +0000 [maven-release-plugin] prepare for next development iteration git-svn-id: https://svn.apache.org/repos/asf/tapestry/tapestry5/trunk@1035364 13f79535-47bb-0310-9956-ffa450edef68 ^C $ git status # On branch 5.2 # Your branch and 'origin/maint-5-2' have diverged, # and have 2 and 2 different commit(s) each, respectively. # nothing to commit (working directory clean) ~/workspaces/tapestry/p $ git svn dcommit Committing to https://svn.apache.org/repos/asf/tapestry/tapestry5/trunk ... ^C ~/workspaces/tapestry/p $ git svn dcommit --commit-url https://svn.apache.org/repos/asf/tapestry/tapestry5/branches/maint-5-2 Committing to https://svn.apache.org/repos/asf/tapestry/tapestry5/branches/maint-5-2 ... Filesystem has no item: '/repos/asf/!svn/bc/1035364/tapestry/tapestry5/branches/maint-5-2' path not found at /opt/local/libexec/git-core/git-svn line 574 ~/workspaces/tapestry/p $ So I just don't know what to do! Strangely, I managed it at some point in the past and can't remember how ... or perhaps I'm being screwed by remote access from England (thus, I believe, hitting the SVN server mirrors, not the primary). -- Howard M. Lewis Ship Creator of Apache Tapestry The source for Tapestry training, mentoring and support. Contact me to learn how I can get you up and productive in Tapestry fast! (971) 678-5210 http://howardlewisship.com --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
