Re: Merged recent work in 4.3.x into the SOC branch; please review

[James Youngman]

On Dec 1, 2007 7:52 PM, James Youngman <address@hidden> wrote:

> All this may be old news, but the 4.3.x tree has also moved on since
> the conclusion of the Google Summer of Code.  I started to merge the
> 4.3.x changes to date into the "polzer" branch at
> http://repo.or.cz/w/findutils.git, but the merge work was significant.
>   Instead of doing the merge the usual way, I merged your "polzer"
> branch and the "master" (that is, currently 4.3.x) branch into
> "polzer2".  The thinking here is that I didn't want to introduce bugs
> into your "polzer" branch just by making a mistake with a manual
> merge.
>
> If you have the time, I would like for you to check that work.

I re-did this as a vanilla merge rather than a rebase operation, which
of course was much less work.  The result of that merge is now in the
polzer2 branch, but I'm much happier wiht the result second time
around.   Happy enough in fact to push the changes into the 'polzer'
branch itself but I'd like to get your OK before doing that.

Thanks,
James.