Bugs item #1949967, was opened at 2008-04-23 13:04 Message generated for change (Settings changed) made by sborho You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=968354&aid=1949967&group_id=199155
Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: None Group: None >Status: Closed Resolution: None Priority: 5 Private: No Submitted By: yertle38 (yertle38) Assigned to: Nobody/Anonymous (nobody) Summary: merge insert "+-" in code Initial Comment: I'm new to Mercurial/TortoiseHg/Tracker, so bear with me. I was attempting to merge and was merging the wrong revision, so I quit out of kdiff for the manual stuff, then did an Unmerge. I then figured out how to merge the proper revision with the tip, and manually selected files for the manuals. However, when we I went to compile the results, I found an extraneous "+-" in one of my files which had been auto-merged. It sure looks to me like when Tortoise shows changes with it's "+-" and "+++" and "---". I unfortunately have no idea if this happened when I merged/unmerged the first time, when I did diffs, or when I did the second merge. If you want me to try to recreate it I will. If this is a known issue, sorry for duplicating. Note, this is all through TortoiseHg, no CLI. I'm running TortoiseHg 0.3 "with Mercurial-9f1e6ab76069+tortoisehg, Python-2.5.1, PyGTK-2.10.4, GTK-2.10.11" ---------------------------------------------------------------------- Comment By: TK Soh (tksoh) Date: 2008-04-23 19:34 Message: Logged In: YES user_id=411637 Originator: NO It'd help if you can post same of the diffs that you've described. A sample repo will be even better. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=968354&aid=1949967&group_id=199155 ------------------------------------------------------------------------------ Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise -Strategies to boost innovation and cut costs with open source participation -Receive a $600 discount off the registration fee with the source code: SFAD http://p.sf.net/sfu/XcvMzF8H _______________________________________________ Tortoisehg-develop mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
