Git help on cygwin

[Jeremy Orlow]

I have a brand new windows setup and am having trouble with "git svn rebase".  Here's what happens:

"""

jorlow@DAYTONA675 /cygdrive/d/chrome1/src

$ git svn rebase

      1 [main] perl 3108 C:\cygwin\bin\perl.exe: *** fatal error - unable to remap C:\cygwin\bin\cygsasl2-2.dll to same address as parent: 0x970000 != 0x9A0000

      1 [main] perl 3108 C:\cygwin\bin\perl.exe: *** fatal error - unable to remap C:\cygwin\bin\cygsasl2-2.dll to same address as parent: 0x970000 != 0x9A0000

      1 [main] perl 3884 fork: child 3108 - died waiting for dll loading, errno 11

      1 [main] perl 3884 fork: child 3108 - died waiting for dll loading, errno 11

"""

I've never done git on windows before, but I think I followed all the instructions and still cannot get it to work.  (I did get it working on mac with no issues.)

I'm using the cygwin version of git, which I thought was the correct one.  Any suggestions?

J

[Evan Martin]

I don't know the exact trick, but I heard it involves rebaseall.

http://www.google.com/search?q=git+svn+cygwin+rebaseall

Can you update our docs if you figure it out?

> --
> Chromium Developers mailing list: chromi...@chromium.org
> View archives, change email options, or unsubscribe:
> http://groups.google.com/a/chromium.org/group/chromium-dev
>

[Anton Muhin]

As Evan says, ash rebaseall (with all cygwin closed) should do the
trick. But on my box it requires several iterations from time to
time.

yours,
anton.

[Jeremy Orlow]

Thanks Anton!

close all cygwin windows

verify via task manager

open cmd

> cd <cygwin path>\bin

> ash rebaseall

I additionally had to chown a temp directory because cygwin couldn't access it.

Will update the git doc.

[Marc-Antoine Ruel]

http://groups.google.com/group/chromium-dev/browse_thread/thread/66b71d35617958c3/97b0ec7b43ca7d82?lnk=gst&q=rebaseall#97b0ec7b43ca7d82

2010/2/19 Jeremy Orlow <jor...@google.com>