Duckwater/Mercurial Cheat sheet
en

Duckwater/Mercurial Cheat sheet

Duckwater Project - Mercurial Cheatsheet

This page is a "cheat sheet" if you will of the commands we normally use in teamware/wx translated to Mercurial with the Cadmium extensions being developed here at Sun.

Cheat sheet

Teamware/wx Mercurial/Cadmium Comments/Notes/Other 
 workspace create ws; bringover -p ... ws usr  hg clone ... ws  Create a full fresh tree 
 wx edit file  N/A  Mercurial files are automatically editable 
 workspace parent  hg paths  hg shows all the paths (parents) listed in the .hg/hgrc file, /.hgrc etc. 
 bringover [ no conflicts]  hg pull; hg update; hg merge; hg commit  This is actually the long form, hg pull -u == hg pull; hg update, hg merge == resolve and hg commit commits the resolved changes to the local tree 
  bringover/resolve [conflicts]  hg pull; hg update; [get conflict messages from update] ; hg update -C changeset-(per error msg) ; hg merge changeset-(per error msg) [+gpyfm file merges] ; hg commit ; (repeat if necessary)  update -C - brings the tree back to older changeset, hg merge - does the resolve running gpyfm per HGMERGE=/opt/onbld/bin/gpyfm (env var), hg commit commits resolved changes 
 wx putback  hg push  both generally assume other stuff happened first (pbchk etc.) 
 wx redelget  hg recommit  collapses the (possibly multiple) deltas, let's you modify the commets etc. 
Tags:
Created by admin on 2009/10/26 12:13
Last modified by admin on 2009/10/26 12:13
XWiki Enterprise 2.7.1.34853 - Documentation