Stack Overflow
Stack Overflow

Questions tagged [rebasing]

23 questions
11
votes
2 answers

.NET assemblies and DLL rebasing

According to this article rebasing is not necessary for .NET assemblies due to JIT compilation of the code. The article states: "JIT-compiled code does not have a rebasing problem since the addresses are generated at run time based on where the…
Brian Rasmussen
  • 114,645
  • 34
  • 221
  • 317
4
votes
2 answers

How to measure the effect of correctly rebasing .NET assemblies before NGen?

Our application has a lot of .NET assemblies, which up until now, has not been deployed with NGen-scripts, so they are always JITted at runtime. Since our application is typically deployed to a terminal server, getting Windows to share binary images…
Lasse V. Karlsen
  • 380,855
  • 102
  • 628
  • 825
3
votes
1 answer

What is the most pythonic way to rebase prices based on a level of a multi index DataFrame?

I have a mulit-index DataFrame that looks like this: In[114]: cdm Out[114]: Last TD Date Ticker 1983-03-30 CLM83 29.40 44 CLN83 29.35 76 CLQ83 29.20 105 CLU83 …
Mth Clv
  • 625
  • 1
  • 7
  • 20
2
votes
2 answers

Dll base address

I've got a small test solution with one exe and three Dlls, the exe calling the three Dlls once each. I've set the Build->Advanced->DLL Base Address setting to 0x41000000, 0x42000000 and 0x43000000 for Dll1.dll, Dll2.dll and Dll3.dll respectively.…
TheIronKnuckle
  • 7,224
  • 4
  • 33
  • 56
2
votes
3 answers

Attempts at Dll rebasing in .net4 don't appear to work

I'm experimenting with Dll rebasing on a small test solution running on .net4 consisting of one small .exe and three small .Dlls. The assembly references have been set up correctly and the program compiles and runs just fine. The aim of this…
TheIronKnuckle
  • 7,224
  • 4
  • 33
  • 56
2
votes
2 answers

What happens if I try to rebase a commit that is already pushed to a development branch

The use case is following I pull from the development branch then I make some code changes and push then After few days I come back and do to a git status, this shows that I am ahead of the master branch by 1 commit, obviously I haven't pulled from…
Dsp guy sam
  • 205
  • 1
  • 7
2
votes
1 answer

I can't seem to squash my commits - could not detach HEAD

I did a fix on my .gitignore but it took a few commits - I now need to squash them but rebasing ended up erroneous and the rebase was aborted I tried rebasing with changing pick to squash, using sourcetree and using -f `git rebase -i e9147 -f error:…
Shyam Patrick
  • 31
  • 2
2
votes
1 answer

Function pointer incorrect in Visual Studio 2005, code starts at 1 byte offset

The code in question hooks into explorer.exe but was crashing on entry to the callback function: Unhandled exception at 0x60055b50 (redacted.dll) in explorer.exe: 0xC0000005: Access violation writing location 0x548b0cca. Callstack: > …
AlexGP
  • 43
  • 1
  • 8
2
votes
1 answer

SQL : Rebase number to 100

I have the following query : WITH CTE AS ( SELECT CASE WHEN shareClassdata.valueDate IS NULL THEN NULL ELSE performanceData.valueDate END AS valueDate ,CASE WHEN…
Gaetan56
  • 519
  • 2
  • 6
  • 17
2
votes
1 answer

Are 2 branches identical if their final snapshot is identical but their commit path not?

The following is a hypothetical scenario meant to get better understanding about the danger of rebasing User A makes 2 commits. He first add (stage) a text file to root directory with the word "Hello", commits it, then adds another file to same…
WITL
  • 107
  • 1
  • 9
2
votes
2 answers

Squashing Commits to a single commit for a bitbucket pull request

I'm trying to work on a version of git flow that can be used for a small team of developers to manage our development process, most of the employees are both new to git and bitbucket. I have more experience with both but I'm by no means an expert. …
Mark
  • 348
  • 4
  • 15
2
votes
1 answer

.NET assembly cache / ngen / jit image warm-up and cool-down behavior

I have an Input Method (IME) program built with C#.NET 2.0 DLL through C++/CLI. Since an IME is always attaching to another application, the C#.NET DLL seems not able to avoid image address rebasing. Although I have applied ngen to create a native…
Barabbas
  • 41
  • 6
1
vote
1 answer

Apply only the changes from a new branch onto an older branch

I have 2 branches : feature1 and feature2 which are based on the develop branch. feature1 is based on an older commit while feature2 is more recent. I want to get only the commits from feature2 that are not in develop onto feature1. I tried git…
Abhilash
  • 85
  • 3
  • 11
1
vote
1 answer

If I want to rebase my DLL's, how do I go about doing it?

This is a continuation of this question. I'm in the process of testing whether rebasing the .NET DLLs, and NGENning them will provide me with more shared code in memory on terminal servers. However, my plan seems to have a flaw, and it's that I seem…
Lasse V. Karlsen
  • 380,855
  • 102
  • 628
  • 825
1
vote
2 answers

How smart is git in rebasing in python?

I'm currently experimenting with git and encountered the following problem. I created a python file with one function called f1 and saved it under main.py and committed it to the master branch. I then created a branch called b1 of that, went back to…
Nickpick
  • 6,163
  • 16
  • 65
  • 116
1
2