Hi Everyone,
This is my first message on this list, so basically to introduce myself, I am
working in aerospace and using TortoiseHg (for Windows) for now 3 years, always
pushing my teams to switch to it.
If I am posting today, it’s because I have some trouble with the merge feature
of the newest versions.
I am used to merge using beyond a compare.
Those days, I have to perform a very complex merge and I am stucked with a
feature that is extremely annoying:
When I have a conflict, I ask Tortoise to take the "other" file and keep the
original in a .orig file, the .orig is added with <<<<<<< local and >>>>>>>
other, but more than this, the other part is merged into the original one !
The two parts are then unaligned and it's impossible to guarantee that the
merge is OK because you have to review it line by line with no help from the
comparison tool. (see screen below):
http://s13.postimg.org/yor6gno47/Untitled.jpg
I want to disable this feature, but so far, I am unable to do it. My only
solution was to revert to an older version of TortoiseHg and execute the merge
on it.
What I want is simply to have the “other” file on one side, and the “original”
file on the other, no modifications at all.
Thanks so much for help as this is furthermore blocking my work.
Regards.
Milan Assuied
________________________________
Avis de confidentialité
Ce courriel, y compris toutes les pièces jointes, peut contenir des
renseignements CONFIDENTIELS et est réservé à l’usage exclusif du destinataire
visé. Il peut contenir des renseignements contrôlés, privilégiés ou de nature
exclusive qui sont protégés en vertu de la loi applicable et ne doivent pas
être divulgués à un tiers non autorisé. Si vous n’êtes pas le destinataire
visé, vous êtes par la présente avisé que tout examen, action, divulgation,
distribution ou reproduction de tout renseignement contenu dans ce courriel et
toute pièce jointe est strictement INTERDIT. Si vous avez reçu ce courriel par
erreur, veuillez en aviser immédiatement l’expéditeur par retour de courriel
que cette transmission a été envoyée par erreur et supprimer toutes les copies
électroniques et papier de ce courriel et des pièces jointes sans en divulguer
le contenu.
Confidentiality Notice
This e-mail, including all attachments may contain CONFIDENTIAL information and
is meant solely for the intended recipient. It may contain controlled,
privileged, or proprietary information that is protected under applicable law
and shall not be disclosed to any unauthorized third party. If you are not the
intended recipient, you are hereby notified that any unauthorized review,
action, disclosure, distribution, or reproduction of any information contained
in this e-mail and any attachments is strictly PROHIBITED. If you received this
e-mail in error, please reply to the sender immediately stating that this
transmission was misdirected, and delete all electronic and paper copies of
this e-mail and attachments without disclosing the contents.
------------------------------------------------------------------------------
Want excitement?
Manually upgrade your production database.
When you want reliability, choose Perforce.
Perforce version control. Predictably reliable.
http://pubads.g.doubleclick.net/gampad/clk?id=157508191&iu=/4140/ostg.clktrk
_______________________________________________
Tortoisehg-discuss mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
