>>> "Uwe" == Uwe Brauer <o...@mat.ucm.es> writes: > Hi
> The question is this: Could I force to pop up a merging tool (again say > meld) which just would show me all the changes of the collaborator's > branch, so that I could cherry pick what I like? The following comes close to what I am looking for, alas it does not work hg init echo Main1 > main.txt hg add main.txt hg commit -m "Main1" echo Main2 >> main.txt hg commit -m "Main2" echo Main3 >> main.txt hg commit -m "Main3" hg branch feature echo Feature1 >> main.txt hg commit -m "Feature1" echo Feature2 >> main.txt hg commit -m "Feature2" hg up default hg merge hg record hg commit --interactively Now I obtain abort: cannot partially commit a merge (use "hg commit" instead) The documentation states it is not possible. But is there a similar command which would do this? Uwe Brauer _______________________________________________ Mercurial mailing list Mercurial@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial
