X-Git-Url: https://oss.titaniummirror.com/gitweb?a=blobdiff_plain;f=in%2Ftinyospkgs.md;h=f81d41557c0faa90c9efb3319863e82da8d7ff5c;hb=9c78235aa6cc9fa205a3aa75a2c8f6590e449333;hp=b24ef4bbd5407a16bd774210544da7c78a6522ea;hpb=ec03993515be63918ead242989467a4562f083ab;p=oss-web.git diff --git a/in/tinyospkgs.md b/in/tinyospkgs.md index b24ef4b..f81d415 100644 --- a/in/tinyospkgs.md +++ b/in/tinyospkgs.md @@ -47,10 +47,10 @@ issue as follows: branch where the checkout of git at `tinyos/2.1.0` exactly matches the checkout of upstream CVS at `release_tinyos_2_1_0_0`. -** If the git and CVS tags checkout trees that match at tag + * If the git and CVS tags checkout trees that match at tag `release_tinyos_2_1_0_0`, then `tinyos/2.1.0` tags that same commit. -** If the git and CVS checkouts diverge, then the first commit along the new + * If the git and CVS checkouts diverge, then the first commit along the new `release/2.1.0` branch contains the changes necessary to sync git with CVS at the release tag. This is accomplished by using `git_load_dirs`. This new commit to the release branch is tagged `tinyos/2.1.0`.