git for windows 2.5 版本发布了,更新之后,使用git svn的时候,就出错
git svn rebase Or git svn dcommit
After a update git for windows 2.5,I encountered this problem.
$ git svn dcommitCommitting to myUrl 0 [main] perl 30192 cygwin_exception::open_stackdumpfile: Dumping stack trace to perl.exe.stackdump Exception: STATUS_ACCESS_VIOLATION at rip=00000000000rax=0000000000000000 rbx=00000006010982B8 rcx=00000006010982B8rdx=00000006010A05F8 rsi=0000000000000011 rdi=0000000000000000r8 =0000000000000000 r9 =00000006010C81E8 r10=0000000000230000r11=000000049F2420D9 r12=000000000022C080 r13=000000000022C088r14=000000060108F308 r15=000000060108F278rbp=000000000022C098 rsp=000000000022C028program=C:\Program Files\Git\usr\bin\perl.exe, pid 18752, thread maincs=0033 ds=002B es=002B fs=0053 gs=002B ss=002BStack trace:Frame Function ArgsEnd of stack trace
github上有人提出这个问题了,但是并没有很好的处理方案。
-=======================
无奈之下,直接写在了git for windows 2.5,重新安装了之前的1.9.5版本
使用git svn rebase的时候,出现了下面的错误,真是坑爹
Administrator@LUJUNTAO /f/Software (temp)
$ git svn rebaseC:\Program Files (x86)\Git\bin\perl.exe: *** unable to remap C:\Program Files(x86)\Git\bin\libsvn_client-1-0.dll to same address as parent -- 0x6D790000 0 [main] perl.exe" 4040 sync_with_child: child 3164(0x2D8) died before initialization with status code 0x1 406 [main] perl.exe" 4040 sync_with_child: *** child state child loading dlls
网上找了很多方法都没啥卵用,最后找一个解决方案
首先,下载cgywin的windows版本,安装在C盘
http://blog.csdn.net/vzq4815/article/details/4636272http://blog.csdn.net/aegeaner/article/details/6993611按照上面2个链接中提到的,打开C:\cygwin64\bin文件夹下的ash.exe
然后运行/bin/rebaseall
之后,重启电脑,就可以正常工作了 一定要记得重启电脑才可以[吐槽下,这里必须先关机。然后手动重启才可以]
可以参考这个问题http://stackoverflow.com/questions/5014554/git-svn-error-under-cygwin
又一次遇到类似的错误,不过按照之前的方法可以解决掉
Administrator@LUJUNTAO /f/Software/ZBMYun/SourceCode/ZITakerHS (temp)
$ git svn dcommitCommitting to https://server2008/svn/ZBMSH/Software ...C:\Program Files (x86)\Git\bin\perl.exe: *** unable to remap C:\Program Files (x86)\Git\bin\libsvn_ra_local-1-0.dll to same address as parent -- 0x6DFE0000 0 [main] perl.exe" 9196 sync_with_child: child 6940(0x2DC) died before initialization with status code 0x1 589 [main] perl.exe" 9196 sync_with_child: *** child state child loading dllsERROR from SVN:
Merge conflict during commit: Your file or directory 'ZBMYun/SourceCode/ZITakerHS/ZITaker/UI/ChannelSelect.cs' is probably out-of-date: resource out of date; try updatingW: f6f259e8ebbc293d565daea1ccde6d060aea67b2 and refs/remotes/git-svn differ, using rebase::040000 040000 044e1cafa5520fb769e893ec1f4fa96565444398 1b863fffc14cce65d8f27a9f0fff4102d689a113 M ZBMYunFirst, rewinding head to replay your work on top of it...Applying: Applying: Applying: ERROR: Not all changes have been committed into SVN, however the committedones (if any) seem to be successfully integrated into the working tree.Please see the above messages for details.