Am 06.04.2012 04:44, schrieb R. David Murray: > I just tried to merge a change from 3.2 to default and found an unexpected > file being merged. Looking at the graph, it *looks* like Sandro copied a > change to default instead of merging it, even though his commit comment > says merge. That would be fine, I'd just do a null merge...except that > the file I'm being asked to merge when I try that seems to have nothing > to do with Sandro's commits. It is deleting one paragraph and adding > another in the threading docs. > > Can someone sort this out, please? It's currently beyond my knowledge > of hg to do so.
Tip: "hg glog" (from the graphlog extension), or any of the GUIs that have this graph view builtin, is very useful to check the actual state of the branches. In this case, as Benjamin noted, it was just a non-merge commit erroneously given the commit message "merge". Georg _______________________________________________ python-committers mailing list python-committers@python.org http://mail.python.org/mailman/listinfo/python-committers
