On Thu, Dec 10, 2015 at 4:17 AM, FLORENT Philippe < [email protected]> wrote: > > Now, some functions are even missing, it is so hard to have a clear view of what’s going on > > > > I am in a prod environment with deadlines, so we send modifs by mail > >
Wait, so you're DELIBERATELY NOT USING YOUR VERSION CONTROL to do your merges, and then complaining that your version control doesn't realize you already did a merge? Sorry to be blunt but you're doing it wrong. > > Shame to come to this, but kdiff is … well I rather not be vulgar > > You've given kdiff bad input. "Garbage in, garbage out," as they say. Mercurial, and thus kdiff, has no way to know what has already been merged. You'll find life is much easier if you use your tools the way they're designed to be used. For instance, you (or a team member) probably had a merge conflict for defining the same function in two different branches. For some reason the person doing that merge chose both sides of the conflict, and saved, even though it is clearly displayed in the merge result area that this has happened. Either that, or you added the same function in two different places, so that kdiff saw independent changes on two branches and automatically selected both. This could be solved by doing proper merges in Mercurial rather than applying patches willy-nilly. > > Adding to this that sometimes, a head cannot be pushed anymore, some of us suddenly get some errors doing so (255 aborted in tortoise) > > The actual error message could help figure out what's going on. Is it just that you're trying to push a new head? Simply merge before pushing to fix that. Or, shoot yourself in the foot even further and force the push. But you probably don't want to do that. > > So we use something like phil3 instead of phil2 (after recloning the central rep) and we’re back on tracks > > You're using what, now? Searching for both of these just gives me Bible references, no software tools. > > Pfff takes ages to get along with a versioning system > > > Sounds like you and your team need to read a tutorial or "getting started" guide to start using Mercurial effectively instead of just diving in and doing everything wrong.
------------------------------------------------------------------------------
_______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
