[GRASS-dev] svn merge usage

[Vaclav Petras]

On Wed, Jan 14, 2015 at 3:29 AM, Martin Landa <landa.martin at gmail.com>
wrote:

> Hi,
>
> 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.
>
> use
>
> 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
> http://geo.fsv.cvut.cz/gwiki/Landa
> http://gismentors.eu/mentors/landa
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osgeo.org/pipermail/grass-dev/attachments/20150114/03f03842/attachment.html>