From: Shawn O. Pearce Date: Sun, 14 Jan 2007 22:44:57 GMT Subject: Re: [PATCH 1/4] Remove unnecessary call_depth parameter in merge-recursive. Message-ID: <20070114224457.GB10888@spearce.org> In-Reply-To: <20070114193503.GB2378@steel.home> Alex Riesen wrote: > Shawn O. Pearce, Sun, Jan 14, 2007 06:28:33 +0100: > > Because the output_indent always matches the call_depth value > > there is no reason to pass around the call_depth to the merge > > function during each recursive invocation. > > Actually, you removed output_indent, not call_depth. Yeaaaaa. That happened because I amended the commit. The first version of it kept output_indent and replaced all call_depth with output_indent. I was then going to do another patch to rename output_indent -> call_depth, but I noticed the patch would be about the same size as that one and would affect the same lines, so I just amended it. Then I didn't edit the commit message. -- Shawn.