From: Wink Saville <wink@saville.com>
To: git@vger.kernel.org
Subject: Re: git-svn segmetation fault
Date: Fri, 01 Feb 2008 16:50:55 -0800 [thread overview]
Message-ID: <47A3BE6F.6080304@saville.com> (raw)
In-Reply-To: <47A39DFD.9020905@saville.com>
Wink Saville wrote:
> I was doing an git-svn dcommit and got a seg fault. The first
> phase of updating svn completed and then it seg faulted on the
> second. So I suspect I'm out of sync and need to recover,
> any guidance appreciated.
>
> If it's any help the svn repo is at
> http://async-msgcomp.googlecode.com/svn.
> If someone needs it I happen to have a backup of the git repo before
> doing the commit and then after the seg fault.
>
> If there is any other information that someone needs I can try
> to supply it.
>
> Cheers,
>
> Wink Saville
<snip/>
<As an update, I first tried to re-execute the dcommit, but that didn't
work: />
wink@ic2d1:$ git-svn dcommit
Committing to https://async-msgcomp.googlecode.com/svn/trunk ...
Merge conflict during commit: Your file or directory
'android/hmc/src/com/saville' is probably out-of-date: The version
resource does not correspond to the resource within the transaction.
Either the requested version resource is out of date (needs to be
updated), or the requested version resource is newer than the
transaction root (restart the commit). at /usr/bin/git-svn line 420
<I than did a rebase that got me back in sync: />
wink@ic2d1:$ git-svn rebase
Index mismatch: 94bbfa6d433192de71060d1274f0b0eab8f49a30 !=
2fcd3a5cc5a9ca062a41d0ff5ac30073f4fa23b0
rereading 8ce31b64294bdb063c64c50b9358533ac8746af4
D android/mc/COPYING.LESSER
D android/mc/COPYING
M android/mc/AndroidManifest.xml
A android/mc/src/com/saville/mc/Mc.java
A android/mc/src/com/saville/mc/McService.java
A android/mc/src/com/saville/mc/McMgr.java
A android/mc/src/com/saville/mc/MsgPump.java
A android/mc/src/com/saville/mc/McBase.java
A android/mc/src/com/saville/mc/ActiveMc.java
A android/mc/src/com/saville/mc/McActivity.java
D android/mc/src/com/saville/android/mc/Mc.java
D android/mc/src/com/saville/android/mc/McService.java
D android/mc/src/com/saville/android/mc/McMgr.java
D android/mc/src/com/saville/android/mc/ActiveMc.java
D android/mc/src/com/saville/android/mc/McActivity.java
M android/mc/src/com/saville/android/testmc/TestMc.java
M android/mc/src/com/saville/android/testmc/TestMcService.java
D android/mctest/COPYING.LESSER
D android/mctest/COPYING
M android/mctest/.classpath
M android/mctest/src/com/saville/android/mctest/McTest.java
M
android/mctest/src/com/saville/android/mctest/McTestClient.java
D android/serdes/COPYING.LESSER
D android/serdes/COPYING
D android/debug/COPYING.LESSER
D android/debug/COPYING
D android/hmc/COPYING.LESSER
D android/hmc/COPYING
M android/hmc/.classpath
D android/hmc/src/com/saville/android/hmc/State.java
D android/hmc/src/com/saville/android/hmc/Hmc.java
D android/hmc/src/com/saville/android/hmc/IState.java
D
android/hmc/src/com/saville/android/testhmc/TestHmcClient.java
D
android/hmc/src/com/saville/android/testhmc/TestDeferredMsgs.java
D
android/hmc/src/com/saville/android/testhmc/TestUnhandledMsgs.java
D
android/hmc/src/com/saville/android/testhmc/TestHmcServer.java
M android/hmc/src/com/saville/android/testhmc/TestHmc.java
A android/hmc/src/com/saville/hmc/HmcBase.java
A android/hmc/src/com/saville/hmc/ActiveHmc.java
A android/hmc/src/com/saville/hmc/Hmc.java
A android/hmc/src/com/saville/testhmc
D android/TestNet1/COPYING.LESSER
D android/TestNet1/COPYING
M android/TestNet1/.classpath
M
android/TestNet1/src/com/saville/android/testnet1/TestNet1.java
M java/mc/src/TestMc.java
D java/mc/src/com/saville/mc/Looper.java
M java/mc/src/com/saville/mc/Mc.java
M java/mc/src/com/saville/mc/McMgr.java
A java/mc/src/com/saville/mc/MsgPump.java
A java/mc/src/com/saville/mc/McBase.java
M java/mc/src/com/saville/mc/ActiveMc.java
M java/mc/src/com/saville/mc/TcpMsgPipe.java
D java/TestClient1/AGPLv3.LICENSE
A java/hmcbase/.classpath
A java/hmcbase/.project
D java/serdes/COPYING.LESSER
D java/serdes/COPYING
D java/msgcomp/COPYING.LESSER
D java/msgcomp/COPYING
A java/msgcomp/src/com/saville/msgcomp/IHmc.java
A java/msgcomp/src/com/saville/msgcomp/State.java
A java/msgcomp/src/com/saville/msgcomp/IActiveMc.java
M java/msgcomp/src/com/saville/msgcomp/IMc.java
A java/msgcomp/src/com/saville/msgcomp/IState.java
M java/msgcomp/src/com/saville/msgcomp/McId.java
A java/msgcomp/src/com/saville/msgcomp/IMcMgr.java
D java/TestMsgPipe1/AGPLv3.LICENSE
D java/debug/COPYING.LESSER
D java/debug/COPYING
D java/TestMsgPipe2/AGPLv3.LICENSE
D java/TestServer1/AGPLv3.LICENSE
A java/hmc/.classpath
A java/hmc/.project
A java/hmc/src/TestHmc.java
A java/hmc/src/com/saville/hmc/HmcBase.java
A java/hmc/src/com/saville/hmc/ActiveHmc.java
A java/hmc/src/com/saville/hmc/Hmc.java
A java/hmc/src/com/saville/testhmc/Test.java
A java/hmc/src/com/saville/testhmc/TestHmcClient.java
A java/hmc/src/com/saville/testhmc/TestDeferredMsgs.java
A java/hmc/src/com/saville/testhmc/TestUnhandledMsgs.java
A java/hmc/src/com/saville/testhmc/TestHmcServer.java
A java/src/HmcBase.java
A java/src/McMgr.java
A java/src/McBase.java
D java/mcmaster/AGPLv3.LICENSE
A COPYING.LESSER
A COPYING
A AGPLv3.LICENSE
r52 = 2336c1c70e92d572f5a1b248249b4f857142bc51 (git-svn)
First, rewinding head to replay your work on top of it...
HEAD is now at 2336c1c... Refactor to reduce duplicated code and have
pure Java Hmc/ActiveHmc.
Nothing to do.
next prev parent reply other threads:[~2008-02-02 0:51 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-01 22:32 git-svn segmetation fault Wink Saville
2008-02-02 0:50 ` Wink Saville [this message]
2008-02-02 3:42 ` Steven Walter
2008-02-02 3:55 ` Wink Saville
2008-02-02 16:03 ` Steven Walter
2008-02-02 18:56 ` Wink Saville
2008-02-02 21:03 ` Steven Walter
2008-02-03 1:21 ` Wink Saville
2008-02-03 2:42 ` Steven Walter
2008-02-03 21:42 ` Wink Saville
2008-02-02 4:06 ` Eric Wong
2008-02-02 4:53 ` Wink Saville
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=47A3BE6F.6080304@saville.com \
--to=wink@saville.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.