Hi devs, what is the preferred way to apply a fix to a branch, given a specific commit to trunk?
I have tried from within the branch root directory the command 'svn merge -c 23794 ../../../trunk/gdal/ .', which works but generates a few non-related diffs like: Property changes on: apps/gdaldem.cpp ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk/gdal/apps/gdaldem.cpp:r23794 Is there a way to get rid of these diffs permanently, or is there another command I should use? I would prefer not to have to save and then apply diffs each time. regards, Etienne _______________________________________________ gdal-dev mailing list gdal-dev@lists.osgeo.org http://lists.osgeo.org/mailman/listinfo/gdal-dev
