> It looks to me like sys/arch/sparc64/sparc64/pmap.c ought to be
> 1.157. But anoncvs only offers:
> 
> $NetBSD: pmap.c,v 1.156.2.2 2005/01/07 14:28:19 jdc Exp $

A pullup to a branch creates a new revision (a branch revision) because the
new file on the branch may not be the same as any file on the trunk.  In
this case, the differences between revisions 1.156 and 1.157 on the trunk
were applied to the netbsd-2-0 branch and the result became 1.156.2.1.
Likewise the 1.157 -> 1.158 change on the trunk was pulled up to revision
1.156.2.2 on that branch (on the netbsd-2 branch, the revsions are 1.156.4.1
and 1.156.4.2, respectively).

So, if you have revision 1.156.2.2 in your checked out netbsd-2-0 tree (i.e.
you have an uptodate tree), you will have the equivalent of the fixes applied
in revisions 1.157 and 1.158 (*).

J

(*) You can use cvsweb's diff to see this by looking at the differences
    between (say) 1.156 and 1.157 and 1.156 and 1.156.2.1, e.g.:

      http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/arch/sparc64/sparc64/pmap.c.diff?r1=1.156&r2=1.156.2.1
      http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/arch/sparc64/sparc64/pmap.c.diff?r1=1.156&r2=1.157

-- 
  My other computer also runs NetBSD    /        Sailing at Newbiggin
        http://www.netbsd.org/        /   http://www.newbigginsailingclub.org/