[kokua-dev] Management of RLVa implementation.

[Nicky Perian]

To ward off possible major upstream merge conflicts I have set mercurial bookmarks Kokua-RLVa and Kokua. These work sort of like git named branches.
http://mercurial.selenic.com/wiki/Bookmarks/ explains bookmarks.

Key point is bookmarks at first have to be pulled with separate commands.

Following is copied from https://bitbucket.org/NickyP/kokua/overview

There are Bookmarks added to allow Kokua-RLVa implementation to be easily moved into and out of play.
Use hg incoming -B // display bookmarks that are on server but not on local.
hg pull -u //update local
hg pull -B Kokua-RLVa //Put the Bookmark in place
hg pull -B Kokua // Put the Bookmark in place
hg update Kokua // update without RLVa
hg update Kokua-RLVa // update with RLVa in play
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.kokuaviewer.org/pipermail/kokua-dev-kokuaviewer.org/attachments/20140221/96317b49/attachment.htm>