From: Michael Plante on 15 Nov 2009 10:22 > >When working with complex project with multiple dependencies in Analog >Devices VDSP, it is necessary to include the project group file into >version control. However, as VDSP automatically updates the time/date >record inside the group file at every session, it causes the annoying >conflicts at version control all the time. Is there a good way to avoid >this type of behavior? We are using SVN. > > >VLV > I still run into the same issue with another Windows IDE. Fortunately in my case, it's possible to usually know I didn't change anything important, and hit SVN revert before updating. Or you could figure out what location in the file is changing (hopefully a constant offset, or something obvious) and write a short program to overwrite it with the value from the conflicting revision. If anything other than the dates are changing, then you've got a mess. Differencing binary files is outdone in badness only by differencing undocumented binary files. One other option, never having used VDSP personally, *might* be to see if there's a way to import settings from a more sane format, and just import every time you load the project. No particularly good solution, as others hinted at... |