Just painfully upgraded to the latest Git (*) and still no luck.
$ git co trunk
Switched to branch 'trunk'
~/workspaces/tapestry/p
$ git co -B 5.2 remotes/origin/maint-5-2
Branch 5.2 set up to track remote branch maint-5-2 from origin.
Switched to and reset branch '5.2'
~/workspaces/tapestry/p
$ git log
commit 4defddf0bd3a8b72ec0ba7ff8e752b58c1839751
Author: Howard Lewis Ship <[email protected]>
Date: Sat Jan 8 01:54:35 2011 +0000
TAP5-1372: Add Request.getServerPort() and change
BaseURLSourceImpl() to use it.
git-svn-id:
https://svn.apache.org/repos/asf/tapestry/tapestry5/branches/maint-5-2@1056592
13f79535-47bb-0310-9956-ffa450edef68
commit b45303ee839c7e229938d4407e55ec9df029f663
Author: Howard Lewis Ship <[email protected]>
Date: Sat Jan 8 00:46:51 2011 +0000
Create branch maint-5-2
git-svn-id:
https://svn.apache.org/repos/asf/tapestry/tapestry5/branches/maint-5-2@1056573
13f79535-47bb-0310-9956-ffa450edef68
~/workspaces/tapestry/p
$ git cherry-pick 4e481871aff0127e4616d99236a27dcebac7b4ca
[5.2 04feeae] TAP5-1208: Shadow FieldConduit values to the adapted
field when in development mode
5 files changed, 82 insertions(+), 30 deletions(-)
~/workspaces/tapestry/p
$ git svn dcommit
Committing to https://svn.apache.org/repos/asf/tapestry/tapestry5/trunk ...
No changes
b45303ee839c7e229938d4407e55ec9df029f663~1 ==
b45303ee839c7e229938d4407e55ec9df029f663
W: b45303ee839c7e229938d4407e55ec9df029f663 and
refs/remotes/origin/trunk differ, using rebase:
:100644 100644 8dbfb9738ef342dc6d48d48a72f7e5e72a84eee2
9683ba81d270e389235bb69329422ca3b457ccae M .gitignore
:000000 100644 0000000000000000000000000000000000000000
78d927322493f3d95c167bba9cabcd30f7d3986c A build.gradle
:100644 100644 bbe0d8eb6a861bb4ce0240b286062877e3c32e08
420f5dd4c9d61fdd62bb43b9e906e5754f7e98be M pom.xml
:040000 040000 bc5ce581eba214c92d82a90efd36878a6b073cc7
42b3cc35d36ca00e60ae12ec08390bd2f8759afe M quickstart
:000000 100644 0000000000000000000000000000000000000000
cb5bbb1bf5309a160d4b3a479e307eed6724f903 A settings.gradle
:040000 040000 b2f1c0e5fac6d0892b7f4e5129e216cb990b679d
1ac8a888a79e8eaa42717cbe8b2833bd9175df45 M src
:040000 040000 83e49cbd557ac8241c0e30a78f28b4b4fb11d059
00d8a1f2e95da5c9f6af34e61f1567627d68310b M tapestry-annotations
:040000 040000 8f4b692ac433a59b43708e0f0d74025cfd71fe60
4db1fa3d79aeb5b38e7cef0b5e34f1e36c7551bb M tapestry-beanvalidator
:040000 040000 c06f6e4970defdf186f84812eebd3fa469309449
b5761ef2bea0108e9789591dae4b918085e2c3dc M tapestry-component-report
:040000 040000 9183bcb6d9df79d8d09b313b03671d5c08d86034
ce6dbb489f23e0bcc49aa4001d94cc706af3bd4e M tapestry-core
:040000 040000 c4c636bc611ab5c9b766c33e71cf6431d12eb1ea
675f6cb9ad37d618ce48ba9669aae3f489833172 M tapestry-func
:040000 040000 7edcef60331013c23cb983b9a64629354ec853d1
5bbb07265d1a0f5a066cd8c5dd716667cc16476d M tapestry-hibernate-core
:040000 040000 2a40f3ed0b1feb2abae59c4735db3a37581ef7cc
ec56baf089a4b28f8a7783ff648c739048518fcf M tapestry-hibernate
:040000 040000 41d71d97997e307a773fda3b96804b62518d5eab
a0f95297d86dc9c6b098d18e48801656bd540637 M tapestry-ioc
:040000 040000 03dfa06cf60ffb22d7ec12150e12fb74a4b64307
24db4ef3ee3f4921509bf9446fecbaf2ec1af974 M tapestry-jmx
:040000 040000 eec9ba6a3047ff86e8fbc7a353446298ef249cec
71e3e05d1ae3c170732303c13a47ed07b5222295 M tapestry-json
:040000 040000 99f8e0651773a566b4c65e6bdbdada2242260ea0
709bea0e971767ecc151fb5609493d45e59c349e M tapestry-spring
:040000 040000 f3146c6f8b250dbdaa53d36fd69f689035169d1b
19161a74106b0b2dc50f6807ffe6636c4a295c5f M tapestry-test
:040000 000000 e613886b1344c0894372e93a26d137d8e201580e
0000000000000000000000000000000000000000 D tapestry-tutorial1
:040000 040000 b09dda77cc65f40249f675c3776b322c8b96b066
4f92aaf354498ebf7d024d82e80e4540e0910ab5 M tapestry-upload
First, rewinding head to replay your work on top of it...
Applying: TAP5-1372: Add Request.getServerPort() and change
BaseURLSourceImpl() to use it.
Using index info to reconstruct a base tree...
<stdin>:66: trailing whitespace.
*
<stdin>:124: trailing whitespace.
*
<stdin>:176: trailing whitespace.
*
warning: 3 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging
tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BaseURLSourceImpl.java
CONFLICT (content): Merge conflict in
tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BaseURLSourceImpl.java
Auto-merging
tapestry-core/src/main/java/org/apache/tapestry5/services/BaseURLSource.java
CONFLICT (content): Merge conflict in
tapestry-core/src/main/java/org/apache/tapestry5/services/BaseURLSource.java
Failed to merge in the changes.
Patch failed at 0001 TAP5-1372: Add Request.getServerPort() and change
BaseURLSourceImpl() to use it.
When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".
rebase refs/remotes/origin/trunk: command returned error: 1
~/workspaces/tapestry/p
$ cat .git/config
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
ignorecase = true
[remote "origin"]
fetch = +refs/heads/*:refs/remotes/origin/*
url = git://git.apache.org/tapestry5.git
[branch "trunk"]
remote = origin
merge = refs/heads/trunk
[svn]
authorsfile = .git/authors.txt
[svn-remote "svn"]
url = https://svn.apache.org/repos/asf
fetch = tapestry/tapestry5/trunk:refs/remotes/origin/trunk
branches = tapestry/tapestry5/branches/*:refs/remotes/origin/*
tags = tapestry/tapestry5/tags/releases/*:refs/remotes/origin/tags/*
[branch "5.2"]
remote = origin
merge = refs/heads/maint-5-2
~/workspaces/tapestry/p
$
The main problem is that Git is confused about where to commit back to
... keeps commiting to trunk, not branches/maint-5-2 on the SVN server
side.
I've tried the same process using the initial command git co -B 5.2
origin/maint-5-2 as well:
$ git co -B 5.2 origin/maint-5-2
Branch 5.2 set up to track remote branch maint-5-2 from origin.
Switched to and reset branch '5.2'
~/workspaces/tapestry/p
$ git cherry-pick 4e481871aff0127e4616d99236a27dcebac7b4ca
[5.2 5bf35fe] TAP5-1208: Shadow FieldConduit values to the adapted
field when in development mode
5 files changed, 82 insertions(+), 30 deletions(-)
~/workspaces/tapestry/p
$ git svn dcommit
Committing to https://svn.apache.org/repos/asf/tapestry/tapestry5/trunk ...
No changes
b45303ee839c7e229938d4407e55ec9df029f663~1 ==
b45303ee839c7e229938d4407e55ec9df029f663
W: b45303ee839c7e229938d4407e55ec9df029f663 and
refs/remotes/origin/trunk differ, using rebase:
:100644 100644 8dbfb9738ef342dc6d48d48a72f7e5e72a84eee2
9683ba81d270e389235bb69329422ca3b457ccae M .gitignore
:000000 100644 0000000000000000000000000000000000000000
78d927322493f3d95c167bba9cabcd30f7d3986c A build.gradle
... same problem. Any ideas?
(*) Git via MacPorts no longer works with git-svn because it upgrades
Perl to 5.12 but the necessary p5-svn library is not available for
5.12, just for 5.8. Ouch!
On Tue, Mar 1, 2011 at 1:36 PM, Howard Lewis Ship <[email protected]> wrote:
> Man, I'm still richly frustrated with git-svn , I still can not seem
> to get it to commit to the maint-5-2 branch, even though I've done it
> before. I'm upgrading to the lastest Git available to me to see if
> that helps.
>
> --
> 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
>
--
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]
