[PATCH] misc size-shrinkage; merges
Rob Landley
rob at landley.net
Sun Aug 20 20:48:06 UTC 2006
On Sunday 20 August 2006 8:31 am, Bernhard Fischer wrote:
> On Fri, Aug 18, 2006 at 11:49:01PM -0400, Rob Landley wrote:
> >On Friday 18 August 2006 11:53 am, Bernhard Fischer wrote:
> >> Hello,
> >>
> >> Just a heads up..
> >> I plan to push the below patchset (split-up, of course) into my
> >
> >Yes please. (Reviewing 4000 lines at once ain't fun.)
> >
> >> 'busybox_scratch' branch soonish, then merge that branch back into
> >> trunk.
>
> [snip if anything else then i-want-git]
I understand, and to an extent sympathize. I want Mercurial and Git to work
together seamlessly, which they currently don't. (I may wind up writing some
code to help them pull from each other, in my copious free time of which I
have none.)
For right now, I'm treating SVN as the master, and my mercurial forks from it
are short-lived and basically experimental.
> >> The majority of the patch -- i.e. the libunarchival changes -- were
> >> provoked by a bug introduced by Rob when he added a function to xfuncs.c
> >> into an improper place and i managed to miss this simple fact early
> >> enough. Still these changes are ok to have, so i will not back them out.
> >
> >What did I break? (Any details on which function, and which bug? With the
>
> xcalloc when dmalloc is configured.
Ah. I haven't even got a test environment for that...
> >> The current branch contains additional changes that saved (IIRC) a few
> >> hundred bytes, refer to svn for details.
> >
> >Always a plus.
>
> I looked and it was s/few/several/
Sounds good.
> I'm done with applying that biggish patch onto my branch, so i'll look
> into merging all these changes back into trunk now..
>
> Attached is the history so far (scratch.log.r15463__to__r15850.txt).
> It should boild down to a more than 2k saving with several fixes.
This is cool, but it doesn't have the actual patches. (Doesn't even say what
files were touched.)
Apparently the svn merge logic doesn't say this either, which is kind of
annoying. I have the vague idea I have to go track down your branch and ask
for the diffs in the context of that branch to see what they actually are,
which gives me warm fuzzies about SVN, I assure you...
Rob
--
Never bet against the cheap plastic solution.
More information about the busybox
mailing list