On 2009 Feb 5, at 9:44, Peter Verswyvelen wrote:
2) modify .hgignore to make sure only these files are added that are part of the project. I want this process to be automated, I don't want to check each time which files to add, since this is error prone.
.darcs/prefs/boring (regexes of files to be excluded)
4) hg commit -m "message" this commits my changes locally. I always do this before pulling since then I'm sure my changes are saved in the case a merge goes wrong.
This is how darcs record works.
5) hg pull -u this pulls in changes, and updates and merges the files, using a visual merger of my preference.
I don't think we have a visual merger yet, but this is darcs pull.
6) hg commit -m "merged" hg push
darcs record as above darcs push if you have direct access to another repo, or darcs send to generate an email patch file (darcs apply to apply it) -- brandon s. allbery [solaris,freebsd,perl,pugs,haskell] allbery@kf8nh.com system administrator [openafs,heimdal,too many hats] allbery@ece.cmu.edu electrical and computer engineering, carnegie mellon university KF8NH