On Fri, Dec 11, 2015 at 3:35 AM, FLORENT Philippe < [email protected]> wrote: > > No need to go wild here, I never said anything about « DELIBERATELY NOT USING YOUR VERSION CONTROL” > > We still do commits and push, I said so far we don’t have time to f@#k around with kdiff merges so I copy paste things manualy >
What you said was "we send modifs by mail" which I had assumed meant that you're manually applying changes from one branch to another branch, and committing without doing a merge. If you really meant that you run a merge in Mercurial and then apply changes manually for every conflicted file rather than using kdiff3, then I guess I misunderstood and I retract my criticism. But if my assumption was correct, then you ARE deliberately not using your version control for merges, and Mercurial cannot know that a particular change has already been merged, because you didn't inform Mercurial of that fact. And no merge tool will help you with that.
------------------------------------------------------------------------------
_______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
