Hi,
thanks for backport!
2014-05-18 15:03 GMT+02:00 <svn_grass@osgeo.org>:
Author: hcho
Date: 2014-05-18 06:03:15 -0700 (Sun, 18 May 2014)
New Revision: 60310
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/raster/r.colors/edit_colors.c
Log:
r.colors: messages (backport r60304)
Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Added: svn:mergeinfo
+ /grass/trunk:60304
please for the next time exclude svn:mergeinfo from backport commit
(`svn revert .`). Thanks, Martin
Oh! I didn’t notice that. That can be my excuse for not back porting :-(.
Thank you.
On May 18, 2014 9:09 AM, “Martin Landa” <landa.martin@gmail.com> wrote:
Hi,
thanks for backport!
2014-05-18 15:03 GMT+02:00 <svn_grass@osgeo.org>:
Author: hcho
Date: 2014-05-18 06:03:15 -0700 (Sun, 18 May 2014)
New Revision: 60310
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/raster/r.colors/edit_colors.c
Log:
r.colors: messages (backport r60304)
Property changes on: grass/branches/releasebranch_7_0
Added: svn:mergeinfo
please for the next time exclude svn:mergeinfo from backport commit
(svn revert .). Thanks, Martin
2014-05-18 15:12 GMT+02:00 Huidae Cho <grass4u@gmail.com>:
Oh! I didn't notice that. That can be my excuse for not back porting :-(.
please, keep your backports 
Thanks, Martin
I cannot find a way to exclude mergeinfo. For a bunch of files backported, do I have to commit each file individually? Hopefully not.
Thanks.
On May 18, 2014 9:14 AM, “Martin Landa” <landa.martin@gmail.com> wrote:
2014-05-18 15:12 GMT+02:00 Huidae Cho <grass4u@gmail.com>:
Oh! I didn’t notice that. That can be my excuse for not back porting :-(.
please, keep your backports
Thanks, Martin
2014-05-18 16:40 GMT+02:00 Huidae Cho <grass4u@gmail.com>:
I cannot find a way to exclude mergeinfo. For a bunch of files backported,
do I have to commit each file individually? Hopefully not.
no, as I already noted
please for the next time exclude svn:mergeinfo from backport commit
(`svn revert .`)
In this case you assume that you don't have any modification in the root.
or better `svn propdel svn:mergeinfo` in the root.
Hi,
2014-05-18 16:47 GMT+02:00 Martin Landa <landa.martin@gmail.com>:
I use this simple script
#!/bin/sh
if test -z $1 ; then
echo "provide rev number to backport"
exit 1
fi
svn merge -c $1 https://svn.osgeo.org/grass/grass/trunk
svn revert .
exit 0
better would be `svn propdel svn:merge info .` as I already noted. Martin
Ok, so
Svn merge …
Svn propdel svn:mergeinfo
Svn commit
Just wondering why svn by default commits svn:mergeinfo, but we don’t want it? Also, I think we’d better update the wiki page with this info.
Thanks.
Huidae
On May 18, 2014 10:48 AM, “Martin Landa” <landa.martin@gmail.com> wrote:
Hi,
2014-05-18 16:47 GMT+02:00 Martin Landa <landa.martin@gmail.com>:
I use this simple script
#!/bin/sh
if test -z $1 ; then
echo “provide rev number to backport”
exit 1
fi
svn merge -c $1 https://svn.osgeo.org/grass/grass/trunk
svn revert .
exit 0
better would be svn propdel svn:merge info . as I already noted. Martin
Martin Landa wrote:
> Added: svn:mergeinfo
> + /grass/trunk:60304
please for the next time exclude svn:mergeinfo from backport commit
Why?
--
Glynn Clements <glynn@gclements.plus.com>
2014-05-18 22:17 GMT+02:00 Glynn Clements <glynn@gclements.plus.com>:
please for the next time exclude svn:mergeinfo from backport commit
Why?
it was common practice till now (for those devs how do backporting).
It's minor issue for me, I have no strong option (I was used to
exclude this svn prop as not useful).
Martin
--
Martin Landa * http://geo.fsv.cvut.cz/gwiki/Landa
Martin Landa wrote:
>> please for the next time exclude svn:mergeinfo from backport commit
>
> Why?
it was common practice till now (for those devs how do backporting).
It's minor issue for me, I have no strong option (I was used to
exclude this svn prop as not useful).
"svn merge" uses that information to avoid applying the same changes
twice.
--
Glynn Clements <glynn@gclements.plus.com>
Does that mean it’s better to commit mergeinfo to avoid duplicate merges by mistake? I think since this is metadata, it shouldn’t affect the source tree.
On May 19, 2014 8:13 AM, “Glynn Clements” <glynn@gclements.plus.com> wrote:
Martin Landa wrote:
please for the next time exclude svn:mergeinfo from backport commit
Why?
it was common practice till now (for those devs how do backporting).
It’s minor issue for me, I have no strong option (I was used to
exclude this svn prop as not useful).
“svn merge” uses that information to avoid applying the same changes
twice.
–
Glynn Clements <glynn@gclements.plus.com>
Huidae Cho wrote:
Does that mean it's better to commit mergeinfo to avoid duplicate merges by
mistake?
Yes.
--
Glynn Clements <glynn@gclements.plus.com>