19 Sep
2008
19 Sep
'08
3:38 p.m.
AMDG Robert Jones wrote:
Then what do I do? I basically want to overwrite our existing boost code with the newer code, but maintain our local edit history so we can see what's changed locally between our old boost code and new. Hence there are lots of additions, changes and deletions, all of which I want to be able see (that's see the differences between our old code and new code, not all the individual boost commits). How can I do this?
I don't know whether this is the best way to achieve this but you can import the new version of boost into a separate branch and then merge with --ignore-ancestry In Christ, Steven Watanabe