hg merge -r tipis NOT the same as
hg merge -r defaultBecause Mercurial's tip may be on a branch. tip is just the most recent changeset, anywhere. I have hit bugs caused by following hg recipes that talk about using -r tip. Sigh.
Andy "Krazy" Glew is a computer architect, a long time poster on comp.arch ... and an evangelist of collaboration tools such as wikis, calendars, blogs, etc. Plus an occasional commentator on politics, taxes, and policy. Particularly the politics of multi-ethnic societies such as Quebec, my birthplace.
The content of this blog is my personal opinion. It is not that of my employer. See Disclaimer.Photo credit: http://docs.google.com/View?id=dcxddbtr_23cg5thdfj
hg merge -r tipis NOT the same as
hg merge -r defaultBecause Mercurial's tip may be on a branch. tip is just the most recent changeset, anywhere. I have hit bugs caused by following hg recipes that talk about using -r tip. Sigh.
1 comment:
Tag this as version-control to be consistent with your other posts.
Post a Comment