Hi All, I've figured out how to diff successfully using P4Merge: Select File > Comparison Method > Ignore Line Ending and All White Space Differences
I couldn't figure it out in Meld but hopefully what I've posted will help someone. One the same topic, but slightly different question: How can I copy test elements from one test plan to another? If I open two test plans in their own instance of JMeter it is not possible to drag / copy / CTRL-C from one to another. Also, I've tried copying elements to the Workbench, then opened a new test plan, but the Workbench is cleared when a test plan is closed. Maybe it would be a good feature to have the workbench store test elements regardless of whether there's a test plan currently loaded or not (But it would still be in-memory). this would enable users to copy elements to-from testplans. Regards, Noel On Monday 09 February 2009 10:26:50 Noel O'Brien wrote: > Hi All, > > I recently introduced JMeter to my workplace and now there are several > people working on different parts of the same test plan file (Acceptance > Test suite.jmx). > > The only problem we're seeing is when we try to check it into our source > code management system (Perforce). As files have been edited in multiple > places they need to be resolved (as expected). However, any diff/merge tool > I've tried to use doesn't correctly pick up the diffs, possibly due to the > nested nature of XML, e.g. if I only add a parent controller to a file and > check it in, the new controller is seen as a change to the controller it > now has beneath it, and this effect cascades down through the file. > > I'm just curious how others deal with this problem or if they even > experience it. How have people gotten around it? I've used the merge tool > in P4V and I've tried Meld too, but both display the issue described above. > Maybe I need to flatten (remove indentation) the file first, then > diff/merge, then re-indent after merge? > > Thanks for you help, > Noel > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
