You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@tapestry.apache.org by Howard <hl...@gmail.com> on 2010/04/19 15:57:05 UTC
[Tapestry Central] Git & Svn : Not Always A Match Made In Heaven
Apache is stuck using Subversion ... so I've been using the Git/Svn
integration built into Git for a while now. The good news is that most
of the Git workflow comes with it ... you can create private branches,
do local commits to your local repository, and build up a series of
changes to dcommit ("delta commit") into SVN.
But that doesn't always work. For reasons I don't understand (given
that there have been no other commits to SVN since I started work in my
private branch), I keep getting the following error:
Applying: Provide the missing asset request handler for the
virtual "stack" folder. Committing to
https://svn.apache.org/repos/asf/tapestry/tapestry5/trunk ... M
tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClasspathAssetAliasManagerImpl.java
M
tapestry-core/src/main/java/org/apache/tapestry5/services/LibraryMapping.java
M
tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClasspathAssetAliasManagerImplTest.java
A
tapestry-core/src/test/java/org/apache/tapestry5/services/LibraryMappingTest.java
Committed r935569 W: 86533530aac8673a9e107e323de5201b7187270f and
refs/remotes/origin/trunk differ, using rebase: :040000 040000
9c78596ee3f916f012c51d8927b4aa31d497f17b
8eb2b9b4f28e825e223c736eaa664bb53018258e M tapestry-core Current branch
trunk is up to date. # of revisions changed before:
07b37e03cbc17012247d2221e795023c564d8228
0830b5f383dc94ae16088185efefac2e1358cf30
0bf378bcafc3f5372b67edc50d7de5bed8713cd0
95c87c5d7a2435df6bfced0d858bfdcb6ff26f22
3cd4ea4d9b225fd5013e1ce72cb9bac6d5b3e5e2
7b95d935099ebbbeb81845c1b8170a89d6ca6421
af310cfa9a5552aab2574c1e345b3beb049fb040
20805630fc67b83b4ca946b942716aeba4c80bef
b3ef5e069942a30e2dce45a35e4be16382c0108d
1be75a15b7f203c927bc2aa34f43dda59ca968e3
555d94ebab122a688b7a1c0af253bf73609f88f5
729757eb3c35e14e126cb6ef16f5032d95d1cc4a
79dcfa32b291454bf9c652d635374d60638b8fb8
304d12f9d7d040f4dc231d213df663fcdf3863b6
0d626a7b0648735ab83bc7a2fd241390eb92e4e2 after:
86533530aac8673a9e107e323de5201b7187270f
07b37e03cbc17012247d2221e795023c564d8228
0830b5f383dc94ae16088185efefac2e1358cf30
0bf378bcafc3f5372b67edc50d7de5bed8713cd0
95c87c5d7a2435df6bfced0d858bfdcb6ff26f22
3cd4ea4d9b225fd5013e1ce72cb9bac6d5b3e5e2
7b95d935099ebbbeb81845c1b8170a89d6ca6421
af310cfa9a5552aab2574c1e345b3beb049fb040
20805630fc67b83b4ca946b942716aeba4c80bef
b3ef5e069942a30e2dce45a35e4be16382c0108d
1be75a15b7f203c927bc2aa34f43dda59ca968e3
555d94ebab122a688b7a1c0af253bf73609f88f5
729757eb3c35e14e126cb6ef16f5032d95d1cc4a
79dcfa32b291454bf9c652d635374d60638b8fb8
304d12f9d7d040f4dc231d213df663fcdf3863b6
0d626a7b0648735ab83bc7a2fd241390eb92e4e2 If you are attempting to
commit merges, try running: git rebase --interactive --preserve-merges
refs/remotes/origin/trunk Before dcommitting ~/work/t5-project $
I did the right things; git co trunk followed by git svn rebase, then
git rebase revised-assets-12apr2010. It claimed to replay my branch
changes on top of the trunk branch, but regardless, the dcommit failed.
Doing some hunting around with Google, I found a partial explanation,
that at least gives me a way forward. I'd still like to know how I got
into this predicament.
At this point I just keep blindly entering the command: git reset
--hard 705ccfb1e27d303a9db62de755b2fcfcca9a02f6 ; git svn rebase; git
svn dcommit and get one Git commit further each time (that's the Git
hash code for my final change in my original branch). Joy.
--
Posted By Howard to Tapestry Central at 4/19/2010 06:57:00 AM
Re: [Tapestry Central] Git & Svn : Not Always A Match Made In Heaven
Posted by Christian Riedel <cr...@googlemail.com>.
Damn you, ash-cloud!
Am 19.04.2010 um 19:28 schrieb Howard Lewis Ship:
> It's looking like the problem is access from Europe:
> http://www.apache.org/dev/version-control.html#latest-baseline
>
> On Mon, Apr 19, 2010 at 9:19 AM, Robert Hailey <ro...@cmediacorp.com> wrote:
>>
>> On Apr 19, 2010, at 8:57 AM, Howard wrote:
>>
>>> Apache is stuck using Subversion ...
>>
>> Looks like you've already identified the root problem :)
>>
>>> Committed r935569 W: 86533530aac8673a9e107e323de5201b7187270f and
>>> refs/remotes/origin/trunk differ, using rebase: :040000 040000
>>> 9c78596ee3f916f012c51d8927b4aa31d497f17b
>>> 8eb2b9b4f28e825e223c736eaa664bb53018258e M tapestry-core Current branch
>>> trunk is up to date. # of revisions changed before:
>>> 07b37e03cbc17012247d2221e795023c564d8228
>>> 0830b5f383dc94ae16088185efefac2e1358cf30
>>> [...]
>>> 79dcfa32b291454bf9c652d635374d60638b8fb8
>>> 304d12f9d7d040f4dc231d213df663fcdf3863b6
>>> 0d626a7b0648735ab83bc7a2fd241390eb92e4e2 after:
>>> 86533530aac8673a9e107e323de5201b7187270f
>>> [...]
>>> 304d12f9d7d040f4dc231d213df663fcdf3863b6
>>> 0d626a7b0648735ab83bc7a2fd241390eb92e4e2 If you are attempting to
>>> commit merges, try running: git rebase --interactive --preserve-merges
>>> refs/remotes/origin/trunk Before dcommitting ~/work/t5-project $
>>
>> Is the output really this garbled? It looks like it's dumping a list of
>> commits when trying to simply get a count.
>>
>> At this point I would first check which version of git you are using.
>>
>>> I did the right things; git co trunk followed by git svn rebase, then
>>> git rebase revised-assets-12apr2010.
>>
>> Without actually having used git with svn, I would bet that the order here
>> is wrong. Whatever work "git svn rebase" has done to line up the git commits
>> with the svn commits would be re-done by the second "normal" rebase. For the
>> second command, perhaps try a 'merge' rather than a 'rebase'.
>>
>>> It claimed to replay my branch
>>> changes on top of the trunk branch, but regardless, the dcommit failed.
>>> Doing some hunting around with Google, I found a partial explanation,
>>> that at least gives me a way forward. I'd still like to know how I got
>>> into this predicament.
>>> At this point I just keep blindly entering the command: git reset
>>> --hard 705ccfb1e27d303a9db62de755b2fcfcca9a02f6 ; git svn rebase; git
>>> svn dcommit and get one Git commit further each time (that's the Git
>>> hash code for my final change in my original branch). Joy.
>>
>> Well... I suppose at worst you could make a quick shell script to repeat
>> that until the head matches the expected value.
>>
>> If you do not have a git branch visualizer (like gitx / gitk), I recommend
>> you get one. You may find that the hash you are reseting to is not from the
>> branch you expect (or that svn expects).
>>
>> --
>> Robert Hailey
>>
>>
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: users-unsubscribe@tapestry.apache.org
>> For additional commands, e-mail: users-help@tapestry.apache.org
>>
>>
>
>
>
> --
> 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: users-unsubscribe@tapestry.apache.org
> For additional commands, e-mail: users-help@tapestry.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tapestry.apache.org
For additional commands, e-mail: users-help@tapestry.apache.org
Re: [Tapestry Central] Git & Svn : Not Always A Match Made In Heaven
Posted by Howard Lewis Ship <hl...@gmail.com>.
It's looking like the problem is access from Europe:
http://www.apache.org/dev/version-control.html#latest-baseline
On Mon, Apr 19, 2010 at 9:19 AM, Robert Hailey <ro...@cmediacorp.com> wrote:
>
> On Apr 19, 2010, at 8:57 AM, Howard wrote:
>
>> Apache is stuck using Subversion ...
>
> Looks like you've already identified the root problem :)
>
>> Committed r935569 W: 86533530aac8673a9e107e323de5201b7187270f and
>> refs/remotes/origin/trunk differ, using rebase: :040000 040000
>> 9c78596ee3f916f012c51d8927b4aa31d497f17b
>> 8eb2b9b4f28e825e223c736eaa664bb53018258e M tapestry-core Current branch
>> trunk is up to date. # of revisions changed before:
>> 07b37e03cbc17012247d2221e795023c564d8228
>> 0830b5f383dc94ae16088185efefac2e1358cf30
>> [...]
>> 79dcfa32b291454bf9c652d635374d60638b8fb8
>> 304d12f9d7d040f4dc231d213df663fcdf3863b6
>> 0d626a7b0648735ab83bc7a2fd241390eb92e4e2 after:
>> 86533530aac8673a9e107e323de5201b7187270f
>> [...]
>> 304d12f9d7d040f4dc231d213df663fcdf3863b6
>> 0d626a7b0648735ab83bc7a2fd241390eb92e4e2 If you are attempting to
>> commit merges, try running: git rebase --interactive --preserve-merges
>> refs/remotes/origin/trunk Before dcommitting ~/work/t5-project $
>
> Is the output really this garbled? It looks like it's dumping a list of
> commits when trying to simply get a count.
>
> At this point I would first check which version of git you are using.
>
>> I did the right things; git co trunk followed by git svn rebase, then
>> git rebase revised-assets-12apr2010.
>
> Without actually having used git with svn, I would bet that the order here
> is wrong. Whatever work "git svn rebase" has done to line up the git commits
> with the svn commits would be re-done by the second "normal" rebase. For the
> second command, perhaps try a 'merge' rather than a 'rebase'.
>
>> It claimed to replay my branch
>> changes on top of the trunk branch, but regardless, the dcommit failed.
>> Doing some hunting around with Google, I found a partial explanation,
>> that at least gives me a way forward. I'd still like to know how I got
>> into this predicament.
>> At this point I just keep blindly entering the command: git reset
>> --hard 705ccfb1e27d303a9db62de755b2fcfcca9a02f6 ; git svn rebase; git
>> svn dcommit and get one Git commit further each time (that's the Git
>> hash code for my final change in my original branch). Joy.
>
> Well... I suppose at worst you could make a quick shell script to repeat
> that until the head matches the expected value.
>
> If you do not have a git branch visualizer (like gitx / gitk), I recommend
> you get one. You may find that the hash you are reseting to is not from the
> branch you expect (or that svn expects).
>
> --
> Robert Hailey
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@tapestry.apache.org
> For additional commands, e-mail: users-help@tapestry.apache.org
>
>
--
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: users-unsubscribe@tapestry.apache.org
For additional commands, e-mail: users-help@tapestry.apache.org
Re: [Tapestry Central] Git & Svn : Not Always A Match Made In Heaven
Posted by Robert Hailey <ro...@cmediacorp.com>.
On Apr 19, 2010, at 8:57 AM, Howard wrote:
> Apache is stuck using Subversion ...
Looks like you've already identified the root problem :)
> Committed r935569 W: 86533530aac8673a9e107e323de5201b7187270f and
> refs/remotes/origin/trunk differ, using rebase: :040000 040000
> 9c78596ee3f916f012c51d8927b4aa31d497f17b
> 8eb2b9b4f28e825e223c736eaa664bb53018258e M tapestry-core Current
> branch
> trunk is up to date. # of revisions changed before:
> 07b37e03cbc17012247d2221e795023c564d8228
> 0830b5f383dc94ae16088185efefac2e1358cf30
> [...]
> 79dcfa32b291454bf9c652d635374d60638b8fb8
> 304d12f9d7d040f4dc231d213df663fcdf3863b6
> 0d626a7b0648735ab83bc7a2fd241390eb92e4e2 after:
> 86533530aac8673a9e107e323de5201b7187270f
> [...]
> 304d12f9d7d040f4dc231d213df663fcdf3863b6
> 0d626a7b0648735ab83bc7a2fd241390eb92e4e2 If you are attempting to
> commit merges, try running: git rebase --interactive --preserve-merges
> refs/remotes/origin/trunk Before dcommitting ~/work/t5-project $
Is the output really this garbled? It looks like it's dumping a list
of commits when trying to simply get a count.
At this point I would first check which version of git you are using.
> I did the right things; git co trunk followed by git svn rebase, then
> git rebase revised-assets-12apr2010.
Without actually having used git with svn, I would bet that the order
here is wrong. Whatever work "git svn rebase" has done to line up the
git commits with the svn commits would be re-done by the second
"normal" rebase. For the second command, perhaps try a 'merge' rather
than a 'rebase'.
> It claimed to replay my branch
> changes on top of the trunk branch, but regardless, the dcommit
> failed.
> Doing some hunting around with Google, I found a partial explanation,
> that at least gives me a way forward. I'd still like to know how I got
> into this predicament.
> At this point I just keep blindly entering the command: git reset
> --hard 705ccfb1e27d303a9db62de755b2fcfcca9a02f6 ; git svn rebase; git
> svn dcommit and get one Git commit further each time (that's the Git
> hash code for my final change in my original branch). Joy.
Well... I suppose at worst you could make a quick shell script to
repeat that until the head matches the expected value.
If you do not have a git branch visualizer (like gitx / gitk), I
recommend you get one. You may find that the hash you are reseting to
is not from the branch you expect (or that svn expects).
--
Robert Hailey
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tapestry.apache.org
For additional commands, e-mail: users-help@tapestry.apache.org