Skip to content
This repository was archived by the owner on Nov 9, 2017. It is now read-only.

fix DLL relocation problem with recompiled SVN libs - #245

Merged
t-b merged 1 commit into
msysgit:masterfrom
kblees:kb/master/fix-libsvn-address-conflict
Aug 16, 2014
Merged

t-b merged 1 commit into
msysgit:masterfrom
kblees:kb/master/fix-libsvn-address-conflict

Conversation

@kblees

@kblees kblees commented Aug 15, 2014

Copy link
Copy Markdown
Contributor

Damn, I'm three hours late for today's maintainance release (big thanks Thomas!).

Luckily, the installer comes with rebase, so people using SVN can simply rebase the two affected libraries themselves.

---8<---
Recompiled libsvn_repos and libneon have the same base address, causing
problems in MSYS fork emulation. Rebase to free regions via:

rebase -b 0x64000000 bin/libsvn_repos-1-0.dll
rebase -b 0x64200000 bin/libneon-25.dll

Signed-off-by: Karsten Blees [email protected]

Recompiled libsvn_repos and libneon have the same base address, causing
problems in MSYS fork emulation. Rebase to free regions via:

  rebase -b 0x64000000 bin/libsvn_repos-1-0.dll
  rebase -b 0x64200000 bin/libneon-25.dll

Signed-off-by: Karsten Blees <[email protected]>
@t-b

t-b commented Aug 15, 2014

Copy link
Copy Markdown
Contributor

Thanks Karsten!
Well I thought better now than never ;)

Just to be sure.
Have you run the git test suite with these two new base addresses?
Some of the svn tests always fail but at least there should be no crash or rebasing address clash.

@kblees

kblees commented Aug 15, 2014

Copy link
Copy Markdown
Contributor Author

@t-b The test suite ran fine even before the fixes...do you have to explicitly enable SVN-tests somehow?

I did successfully 'git svn clone' and 'git svn fetch' one of our company SVN repos, though (via http and https).

@t-b

t-b commented Aug 15, 2014

Copy link
Copy Markdown
Contributor

@kbless No the svn tests always run.

Here I always got the "mapping to same address" errors on invocation of "git svn".

I'll check tomorrow.

t-b added a commit that referenced this pull request Aug 16, 2014
…lict

fix DLL relocation problem with recompiled SVN libs
@t-b
t-b merged commit 5bdb1c4 into msysgit:master Aug 16, 2014
@t-b

t-b commented Aug 16, 2014

Copy link
Copy Markdown
Contributor

Now git svn works here also :)

@dscho

dscho commented Aug 16, 2014

Copy link
Copy Markdown
Member

Nice!

@dscho

dscho commented Aug 16, 2014

Copy link
Copy Markdown
Member

FWIW it fixed the issue here, too!

@kjeremy

kjeremy commented Aug 21, 2014

Copy link
Copy Markdown

Since this fixes a breaking bug can we get a new release?

@AronVanAmmers

Copy link
Copy Markdown

Thanks, fixed the issue for me.

Note that the rebase commands have to be run in /C/Program Files (x86)/Git, as an Administrator. When running as a non-admin you'll see this:

$ rebase -b 0x64000000 bin/libsvn_repos-1-0.dll
ReBaseImage (bin/libsvn_repos-1-0.dll) failed with last error = 6

@dscho

dscho commented Aug 22, 2014

Copy link
Copy Markdown
Member

@kjeremy no. Because I am mean and want you to not have any working git svn. Muahahahaha!

;-)

@kjeremy

kjeremy commented Aug 22, 2014

Copy link
Copy Markdown

Haha. That's fair. 👍

@bizm

bizm commented Sep 8, 2014

Copy link
Copy Markdown

When i run those rebase commands i get the following

bin/libsvn_repos-1-0.dll: skipped because nonexistent
bin/libneon-25.dll: skipped because nonexistent

any ideas?

@kblees

kblees commented Sep 8, 2014

Copy link
Copy Markdown
Contributor Author

@bizm try /bin... or cd to the Git installation directory first ("cd /")

@bizm

bizm commented Sep 8, 2014

Copy link
Copy Markdown

@kblees it worked from the Git installation directory. thanks a lot!

@albfan

albfan commented Feb 9, 2015

Copy link
Copy Markdown

I suffer same problem with libsvn_delta-1-0.dll

Solve it issuing:

> cd "C:\Program Files (x86)\Git\bin"
> rebase -b 0x64400000 libsvn_delta-1-0.dll

Didn't know the rules about BaseAddress, just added another 200000 to 0x64200000 from previous posts

@chucklu

chucklu commented Feb 16, 2016

Copy link
Copy Markdown

@albfan I got this error
$ git svn rebase
C:\Program Files (x86)\Git\bin\perl.exe: *** unable to remap C:\Program Files (x
86)\Git\bin\libsvn_ra_svn-1-0.dll to same address as parent -- 0x6D510000
0 [main] perl.exe" 6924 sync_with_child: child 7180(0x2D8) died before ini
tialization with status code 0x1
985 [main] perl.exe" 6924 sync_with_child: *** child state child loading dll
s

@albfan

albfan commented Feb 16, 2016

Copy link
Copy Markdown

@chucklu this should fix your problem

> cd "C:\Program Files (x86)\Git\bin"
> rebase -b 0x6D710000 libsvn_ra_svn-1-0.dll

@chucklu

chucklu commented Feb 16, 2016

Copy link
Copy Markdown

@albfan thank you very much
I have installed the cygwin ,and use ash.exe
/bin/rebaseall

@MerzDaniel

MerzDaniel commented Jul 26, 2016 •

Copy link
Copy Markdown

@kblees , @albfan , @albfan
I face multiple problems concerning git svn in Windows. From different posts throughout the internet I found many baseAddresses for the dlls. But nobody posts how they found out the specific 'baseaddress' for a '.dll'. My 'git svn' still doesn't work with all features for me.

Where to get a full list of these base addresses? Try'n error seems not right for me...

@dscho

dscho commented Jul 26, 2016

Copy link
Copy Markdown
Member

@MerzDaniel you do know that you posted to an abandoned project, right? Did you try its successor, Git for Windows 2.x yet?

@MerzDaniel

Copy link
Copy Markdown

update to 2.x solved the problem :P

@chucklu

chucklu commented Jul 27, 2016

Copy link
Copy Markdown

@MerzDaniel no, at least 1.x git svn can work
but in 2.x ,the git svn just crashed,you can find this issue
git-for-windows/git#274

@MerzDaniel

Copy link
Copy Markdown

Then to be more accurate:
On my Windows7 x64

  1. Deinstalling Git 1.9
  2. Rebooting
  3. Installing Git 2.9.2.windows.1
    solved all my git svn related dll-Issues after all rebase memory address approaches failed to fix the problem for me.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants