edit version history (author,date or commit message)

Hans Meine meine at informatik.uni-hamburg.de
Wed Jan 20 04:01:38 CST 2010


On Wednesday 20 January 2010 10:48:01 Dirkjan Ochtman wrote:
> 2010/1/20 Hans Meine <meine at informatik.uni-hamburg.de>:
> > - are *pure* merges (not so easy to detect with current hg API, is it?)
> 
> What's a *pure* merge?

A merge that did not involve manual changes, but simply a "hg merge && hg 
commit" (potentially with options of course).  For instance, a merge of 
changesets affecting totally separate sets of files.

The opposite of a pure merge would be a merge that includes totally new code, 
since it's perfectly possible to introduce any new code between "hg merge" and 
"hg commit".

In between would be a merge that included patching files without user 
interaction.  In this case, the result of the merge might depend on the merge 
tool configuration, so it could be hard to detect whether a human or some 
clever merge tool touched the file.

IIRC bzr (or git?) differentiates between pure and real merges.

Have a nice day,
  Hans


More information about the Mercurial mailing list