On Thu, Jan 28, 2010 at 6:14 AM, Neal Becker <ndbeck...@gmail.com> wrote: > I've been debugging some problem. I added various 'print' statements, > asserts, etc. Now, I'm ready to commit. I want to review the changes, > getting rid of those extraneous print but keeping the bug fix. > > I ran hgtk vdiff. It brings up kdiff3 (as I wanted). I set it to merge. > Save the output.
merge? isn't it a two way text diff? > Surprise! The output is just written to some tmp file and discarded. > > How should I be doing this under hgtk (and could it be more obvious)? Any modifications made in kdiff3 have to be done to the working copy file, not the temp file. It's a lot more obvious which side is the temp file in the new 0.10 visual diff code. Usually, when I want to filter print statements, I use the hunk selection facility in the commit tool to leave the prints out of the commit, do the commit, then revert the file. -- Steve Borho ------------------------------------------------------------------------------ The Planet: dedicated and managed hosting, cloud storage, colocation Stay online with enterprise data centers and the best network in the business Choose flexible plans and management services without long-term contracts Personal 24x7 support from experience hosting pros just a phone call away. http://p.sf.net/sfu/theplanet-com _______________________________________________ Tortoisehg-discuss mailing list Tortoisehg-discuss@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
