<html><body><div style="color:#000; background-color:#fff; font-family:HelveticaNeue, Helvetica Neue, Helvetica, Arial, Lucida Grande, sans-serif;font-size:10pt"><div>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.</div><div>http://mercurial.selenic.com/wiki/Bookmarks/ explains bookmarks.<br></div><div style="color: rgb(0, 0, 0); font-size: 13px; font-family: HelveticaNeue, 'Helvetica Neue', Helvetica, Arial, 'Lucida Grande', sans-serif; background-color: transparent; font-style: normal;">Key point is bookmarks at first have to be pulled with separate commands.</div><div style="color: rgb(0, 0, 0); font-size: 13px; font-family: HelveticaNeue, 'Helvetica Neue', Helvetica, Arial, 'Lucida Grande', sans-serif; background-color: transparent; font-style: normal;"><br></div><div style="color: rgb(0, 0, 0); font-size: 13px; font-family: HelveticaNeue, 'Helvetica
Neue', Helvetica, Arial, 'Lucida Grande', sans-serif; background-color: transparent; font-style: normal;">Following is copied from https://bitbucket.org/NickyP/kokua/overview</div><div style="color: rgb(0, 0, 0); font-size: 13px; font-family: HelveticaNeue, 'Helvetica Neue', Helvetica, Arial, 'Lucida Grande', sans-serif; background-color: transparent; font-style: normal;"><br></div><div style="background-color: transparent;">There are Bookmarks added to allow Kokua-RLVa implementation to be easily moved into and out of play.</div><div style="background-color: transparent;">Use hg incoming -B // display bookmarks that are on server but not on local.</div><div style="background-color: transparent;">hg pull -u //update local</div><div style="background-color: transparent;">hg pull -B Kokua-RLVa //Put the Bookmark in place</div><div style="background-color: transparent;">hg pull -B Kokua // Put the Bookmark in place</div><div style="background-color:
transparent;">hg update Kokua // update without RLVa</div><div style="background-color: transparent;">hg update Kokua-RLVa // update with RLVa in play</div></div></body></html>