[sldev] 1.18.1 and 1.18.2 svn branches are equal?

[Dale Glass]

I've just FINALLY updated to 1.18.2. I noticed the 1.18.1 branch got an
update, and merged that to my source before starting merging the new
1.18.2 one. But:

dale at madhatter ~/svk $ svk diff //ll/branches/Branch_1-18-2-Viewer
//ll/branches/Branch_1-18-1
dale at madhatter ~/svk $

dale at madhatter ~/svk $ svk cat
//ll/branches/Branch_1-18-1/indra/llcommon/llversion.h
[snip]
const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 18;
const S32 LL_VERSION_PATCH = 2;
const S32 LL_VERSION_BUILD = 0;


Did the 1.18.1 branch get the 1.18.2 changes and THEN branched to
1.18.2, or I screwed up something here?


-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://lists.secondlife.com/pipermail/sldev/attachments/20070828/e3545c84/attachment.pgp