[GRASS-dev] svn merge usage

[Vaclav Petras]

On Thu, Jan 15, 2015 at 2:36 AM, Glynn Clements <glynn at gclements.plus.com>
wrote:

> Vaclav Petras wrote:
>
> > 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?
>
> Deleting the svn:mergeinfo property is probably safe, as we're
> unlikely to ever merge entire branches.
>

On Thu, Jan 15, 2015 at 8:33 AM, Markus Neteler <neteler at osgeo.org> wrote:

> Backported in r64193 (along with "svn propdel svn:mergeinfo ." to see
> how it behaves).
>

It deletes all mergeinfos, so we got a large diff now [1], Trac shows it in
siple way [2]. However, next time it will remain deleted as long as we
use `propdel`,
so no large diffs will be happening and everything will be fine.

To paraphrase one of Git design rules [3]: If SVN offers some feature, be
sure not to use it.

Vaclav

[1] http://lists.osgeo.org/pipermail/grass-commit/2015-January/035099.html
[2] http://trac.osgeo.org/grass/changeset/64193g
[3]
http://en.wikipedia.org/w/index.php?title=Git_%28software%29&oldid=641271361#History
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osgeo.org/pipermail/grass-dev/attachments/20150115/215478e2/attachment.html>