Hi, I just committed a warning message change in TRUNK, but I think some un-backported changes were also committed to grass63_release inadvertently during my commit.
Can someone confirm that everything is ok? Sorry for the headache.
~ Eric.
Hi, I just committed a warning message change in TRUNK, but I think some un-backported changes were also committed to grass63_release inadvertently during my commit.
Can someone confirm that everything is ok? Sorry for the headache.
I think I failed to sync my grass63_release source with the svn repo before committing. My submission incorporates Martin's edits from changeset 29556 as well, if I'm not mistaken.
What's the proper svn magic for cases like these?
~ Eric.
Eric,
please tell us the commit(s) from
http://trac.osgeo.org/grass/timeline
to better understand it.
Markus
On Mon, Mar 3, 2008 at 7:11 PM, Patton, Eric <epatton@nrcan.gc.ca> wrote:
>Hi, I just committed a warning message change in TRUNK, but I think some un-backported changes were also committed to grass63_release inadvertently during my commit.
>
>Can someone confirm that everything is ok? Sorry for the headache.I think I failed to sync my grass63_release source with the svn repo before committing. My submission incorporates Martin's edits from changeset 29556 as well, if I'm not mistaken.
What's the proper svn magic for cases like these?
~ Eric.
_______________________________________________
grass-dev mailing list
grass-dev@lists.osgeo.org
http://lists.osgeo.org/mailman/listinfo/grass-dev
--
Open Source Geospatial Foundation
http://www.osgeo.org/
http://www.grassbook.org/
Markus,
Changeset 30450 should have been identical to changeset 30449; the only change I intended to make was to improve the wording of the warning message in trunk/raster/r.out.gdal/main.c line 323 and 328; the backport to grass63_branch should have had only these two changes. I don't know how all those other diffs found their way in the commit, as I have never edited any other source code in that file. So changeset 30450 should be reverted.
~ Eric.
-----Original Message-----
From: neteler.osgeo@gmail.com on behalf of Markus Neteler
Sent: Tue 3/4/2008 6:13 PM
To: Patton, Eric
Cc: grass-dev@lists.osgeo.org
Subject: Re: [GRASS-dev] Update to r.out.gdal
Eric,
please tell us the commit(s) from
http://trac.osgeo.org/grass/timeline
to better understand it.
Markus
On Mon, Mar 3, 2008 at 7:11 PM, Patton, Eric <epatton@nrcan.gc.ca> wrote:
>Hi, I just committed a warning message change in TRUNK, but I think some un-backported changes were also committed to grass63_release inadvertently during my commit.
>
>Can someone confirm that everything is ok? Sorry for the headache.I think I failed to sync my grass63_release source with the svn repo before committing. My submission incorporates Martin's edits from changeset 29556 as well, if I'm not mistaken.
What's the proper svn magic for cases like these?
~ Eric.
_______________________________________________
grass-dev mailing list
grass-dev@lists.osgeo.org
http://lists.osgeo.org/mailman/listinfo/grass-dev
--
Open Source Geospatial Foundation
http://www.osgeo.org/
http://www.grassbook.org/
Eric,
I would leave the decision to Martin:
http://trac.osgeo.org/grass/changeset/30450
Markus
On Wed, Mar 5, 2008 at 1:17 PM, Patton, Eric <epatton@nrcan.gc.ca> wrote:
Markus,
Changeset 30450 should have been identical to changeset 30449; the only change I intended to make was to improve the wording of the warning message in trunk/raster/r.out.gdal/main.c line 323 and 328; the backport to grass63_branch should have had only these two changes. I don't know how all those other diffs found their way in the commit, as I have never edited any other source code in that file. So changeset 30450 should be reverted.
~ Eric.
-----Original Message-----
From: neteler.osgeo@gmail.com on behalf of Markus Neteler
Sent: Tue 3/4/2008 6:13 PM
To: Patton, Eric
Cc: grass-dev@lists.osgeo.org
Subject: Re: [GRASS-dev] Update to r.out.gdalEric,
please tell us the commit(s) from
http://trac.osgeo.org/grass/timeline
to better understand it.
Markus
On Mon, Mar 3, 2008 at 7:11 PM, Patton, Eric <epatton@nrcan.gc.ca> wrote:
> >Hi, I just committed a warning message change in TRUNK, but I think some un-backported changes were also committed to grass63_release inadvertently during my commit.
> >
> >Can someone confirm that everything is ok? Sorry for the headache.
>
> I think I failed to sync my grass63_release source with the svn repo before committing. My submission incorporates Martin's edits from changeset 29556 as well, if I'm not mistaken.
>
> What's the proper svn magic for cases like these?
>
>
>
> ~ Eric.
>
>
> _______________________________________________
> grass-dev mailing list
> grass-dev@lists.osgeo.org
> http://lists.osgeo.org/mailman/listinfo/grass-dev
>--
Open Source Geospatial Foundation
http://www.osgeo.org/
http://www.grassbook.org/
--
Open Source Geospatial Foundation
http://www.osgeo.org/
http://www.grassbook.org/
Hi,
2008/3/6, Markus Neteler <neteler@osgeo.org>:
I would leave the decision to Martin:
http://trac.osgeo.org/grass/changeset/30450
I think we can leave it as it is now (sync'ed with trunk),
Martin
Markus
On Wed, Mar 5, 2008 at 1:17 PM, Patton, Eric <epatton@nrcan.gc.ca> wrote:
> Markus,
>
> Changeset 30450 should have been identical to changeset 30449; the only change I intended to make was to improve the wording of the warning message in trunk/raster/r.out.gdal/main.c line 323 and 328; the backport to grass63_branch should have had only these two changes. I don't know how all those other diffs found their way in the commit, as I have never edited any other source code in that file. So changeset 30450 should be reverted.
>
> ~ Eric.
>
>
>
>
> -----Original Message-----
> From: neteler.osgeo@gmail.com on behalf of Markus Neteler
> Sent: Tue 3/4/2008 6:13 PM
> To: Patton, Eric
> Cc: grass-dev@lists.osgeo.org
> Subject: Re: [GRASS-dev] Update to r.out.gdal
>
> Eric,
>
> please tell us the commit(s) from
>
> http://trac.osgeo.org/grass/timeline
>
> to better understand it.
>
> Markus
>
> On Mon, Mar 3, 2008 at 7:11 PM, Patton, Eric <epatton@nrcan.gc.ca> wrote:
> > >Hi, I just committed a warning message change in TRUNK, but I think some un-backported changes were also committed to grass63_release inadvertently during my commit.
> > >
> > >Can someone confirm that everything is ok? Sorry for the headache.
> >
> > I think I failed to sync my grass63_release source with the svn repo before committing. My submission incorporates Martin's edits from changeset 29556 as well, if I'm not mistaken.
> >
> > What's the proper svn magic for cases like these?
> >
> >
> >
> > ~ Eric.
> >
> >
> > _______________________________________________
> > grass-dev mailing list
> > grass-dev@lists.osgeo.org
> > http://lists.osgeo.org/mailman/listinfo/grass-dev
> >
>
>
>
> --
> Open Source Geospatial Foundation
> http://www.osgeo.org/
> http://www.grassbook.org/
>
>--
Open Source Geospatial Foundation
http://www.osgeo.org/
http://www.grassbook.org/
_______________________________________________
grass-dev mailing list
grass-dev@lists.osgeo.org
http://lists.osgeo.org/mailman/listinfo/grass-dev
--
Martin Landa <landa.martin gmail.com> * http://gama.fsv.cvut.cz/~landa *