I'm still getting this error everytime I commit:
~/work/t5-project
$ git svn rebase
Current branch trunk is up to date.
~/work/t5-project
$ git svn dcommit
Committing to https://svn.apache.org/repos/asf/tapestry/tapestry5/trunk ...
M src/site/apt/guide/event.apt
M
tapestry-core/src/main/java/org/apache/tapestry5/ComponentEventCallback.java
Committed r935653
W: b84c09082479d188a64b8053cd382dc329fe2603 and
refs/remotes/origin/trunk differ, using rebase:
:040000 040000 60b918e3fffb35e572aa3685e496eba28544743b
5bb4c85f28503a1af2b29cf386cd2c01835595b3 M src
:040000 040000 52f42302f92fb487df6232561bbb51e07d5f2d16
0b208b7d453aaa17f3e09503332b17ab4d106b66 M tapestry-core
Current branch trunk is up to date.
# of revisions changed
before:
after:
b84c09082479d188a64b8053cd382dc329fe2603
If you are attempting to commit merges, try running:
git rebase --interactive --preserve-merges refs/remotes/origin/trunk
Before dcommitting
~/work/t5-project
$
I looks like the commit is OK but I get this bizarre error. Worse, it
may be an issue in the SVN repository ... I just did a fresh checkout
via Git and am still getting this error. Any clues?
--
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]
