[GRASS-dev] svn merge usage
wenzeslaus at gmail.com
Wed Jan 14 06:45:55 PST 2015
On Wed, Jan 14, 2015 at 3:29 AM, Martin Landa <landa.martin at gmail.com>
> 2015-01-14 7:16 GMT+01:00 Vaclav Petras <wenzeslaus at gmail.com>:
> > the reason Martin was forced to comment it out in his script. I did `svn
> > revert .` to get rid of any changes in properties but this will not work
> > when you changed some files in root directory I guess.
> svn propdel svn:mergeinfo .
> This deletes all mergeinfos, so you got a large diff when you executed.
You are saying that this is ok, i.e. we want to get rid of the infos?
> instead. Martin
> Martin Landa
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the grass-dev