rid backend seems to be initialized twice?

[simo]

On Thu, 2007-10-11 at 18:29 -0500, Gerald (Jerry) Carter wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> simo wrote:
> > On Thu, 2007-10-11 at 17:29 -0500, Gerald (Jerry) Carter wrote:
> >> -----BEGIN PGP SIGNED MESSAGE-----
> >> Hash: SHA1
> >>
> >> simo wrote:
> >>> On Thu, 2007-10-11 at 14:21 -0400, simo wrote:
> >>>> On Thu, 2007-10-11 at 18:43 +0400, Dmitry Butskoy wrote:
> >>>>> ...and consider this little cosmetic one as well... :)
> >>>> Make sense,
> >>>> as soon as I am comfortable with git I'll push it.
> >>>
> >>> Pushed.
> >> You know you only pushed to v3-0-test right ?
> > 
> > Yes, I am still learning how to properly merge in 
> > other branches, once I've done that (then I got
> > distracted of course).
> > 
> > If you have a quick liner that would be nice.
> 
> ## cherry pick the HEAD commit from v3-0-test
> $ git-checkout -b v3-2-test origin/v3-2-test
> $ git-cherry-pick \
>   `git-log --pretty=one origin/v3-0-test | awk '{print $1}'`

The file was moved from nsswitch/idmap.c to winbind/idmap.c, If I use
git-cherry-pick to pick only the specific hash that identify my patch,
it recognizes something happened, but insted of patching the right file
it creates a complete new nsswitch/idmap.c file ?

Is there something I should do? Or is there no other way but simply diff
and patch the new file manually and basically create a new commit ?

In that case I would avoid git-cherry=pick and just directly patch and
commit in the other branch I guess, or is there value in keeping it a
cross-branch merge ?

Simo.