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]
