Kev Mann / mbed-dev-OS5_10_4

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

features/nanostack/nanostack-hal-mbed-cmsis-rtos/nvm/README.md@2:7aab896b1a3b, 2019-03-13 (annotated)

Committer:
kevman
Date:
Wed Mar 13 11:03:24 2019 +0000
Revision:
2:7aab896b1a3b
Parent:
0:38ceb79fef03 
2019-03-13

Who changed what in which revision?

UserRevisionLine numberNew contents of line
kevman 0:38ceb79fef03 1 This directory is used as a git subtree. The master copy is at
kevman 0:38ceb79fef03 2
kevman 0:38ceb79fef03 3 https://github.com/ARMmbed/nanomesh-applications/tree/nvm
kevman 0:38ceb79fef03 4
kevman 0:38ceb79fef03 5 (ie the nvm branch of that repository).
kevman 0:38ceb79fef03 6
kevman 0:38ceb79fef03 7 If you are seeing this as a subdirectory of another repository,
kevman 0:38ceb79fef03 8 or in Platforms/common/nvm of the same repository, it has been
kevman 0:38ceb79fef03 9 pulled in via git subtree.
kevman 0:38ceb79fef03 10
kevman 0:38ceb79fef03 11 You should not normally edit files in this directory unless you are
kevman 0:38ceb79fef03 12 working on the nvm branch in a clone of the master repository.
kevman 0:38ceb79fef03 13
kevman 0:38ceb79fef03 14 Changes to the nvm code would be done as follows:
kevman 0:38ceb79fef03 15
kevman 0:38ceb79fef03 16 # nvm branch is the "master" for the code
kevman 0:38ceb79fef03 17 git checkout nvm
kevman 0:38ceb79fef03 18
kevman 0:38ceb79fef03 19 # make and commit changes
kevman 0:38ceb79fef03 20 git checkout master
kevman 0:38ceb79fef03 21 git subtree merge -P Platforms/common/nvm nvm
kevman 0:38ceb79fef03 22
kevman 0:38ceb79fef03 23 To take the latest version of the nvm reference code into another
kevman 0:38ceb79fef03 24 repository already containing it as a subtree, use the command:
kevman 0:38ceb79fef03 25
kevman 0:38ceb79fef03 26 git subtree pull -P our/path/to/nvm \
kevman 0:38ceb79fef03 27 git@github.com:ARMmbed/nanomesh-applications nvm
kevman 0:38ceb79fef03 28
kevman 0:38ceb79fef03 29 To take this code into use as a subtree for the first time,
kevman 0:38ceb79fef03 30 use the command:
kevman 0:38ceb79fef03 31
kevman 0:38ceb79fef03 32 git subtree add -P our/path/to/nvm \
kevman 0:38ceb79fef03 33 git@github.com:ARMmbed/nanomesh-applications nvm
kevman 0:38ceb79fef03 34
kevman 0:38ceb79fef03 35 See 'git help subtree' for more information.
kevman 0:38ceb79fef03 36