I had some problems adding dm and gism to their new locations in /gui/tcltk and didn’t realize it until a few minutes ago. I think (hope) I’ve remedied this and they are in the cvs now.
Michael
Michael Barton, Professor of Anthropology
School of Human Evolution and Social Change
Arizona State University
Tempe, AZ 85287-2402
USA
voice: 480-965-6262; fax: 480-965-7671
www: http://www.public.asu.edu/~cmbarton
Michael,
You're adding files to display/ not to gui/tcltk/.
Huidae Cho
On Fri, Feb 17, 2006 at 02:17:35PM -0700, Michael Barton wrote:
I had some problems adding dm and gism to their new locations in
/gui/tcltk and didn't realize it until a few minutes ago. I think
(hope) I've remedied this and they are in the cvs now.
Michael
______________________________
Michael Barton, Professor of Anthropology
School of Human Evolution and Social Change
Arizona State University
Tempe, AZ 85287-2402
USA
voice: 480-965-6262; fax: 480-965-7671
www: [1]http://www.public.asu.edu/~cmbartonReferences
On Fri, Feb 17, 2006 at 02:17:35PM -0700, Michael Barton wrote:
I had some problems adding dm and gism to their new locations in
/gui/tcltk and didn't realize it until a few minutes ago. I think
(hope) I've remedied this and they are in the cvs now.
Michael, All,
I have fixed this yesterday (and my nice explanation emails somehow
did not make it to this list, so here is a brief version).
To me it looked like Michael's CVS client did not work properly.
I have not moved the files, please make sure that you all check out/update
display/ and gui/ properly before new commits.
As Michael has send my a tarball, I have added a bunch of new files
to gui/tcltk/gis.m/ that have not been in the old location.
One file I did NOT add was "copy tree.tcl" or so.
Michael: I suggest that you rename this file to not contain
a space character before adding.
CVS general insights:
The move could be done with regular cvs add and cvs remove commands.
This was better then moving files within the repository, because now
people can still check out old non-branch-tags and get the same files.
Other:
When looking at new files, I have noticed that they do not contain
a hint towards the license and the right holder.
I suggest to add this as a standard header in addition to the author(s).
My memory tells me that we debated standard headers quite a while before
on this list.
Best,
Bernhard
On Sun, Feb 19, 2006 at 07:57:54PM +0100, Bernhard Reiter wrote:
On Fri, Feb 17, 2006 at 02:17:35PM -0700, Michael Barton wrote:
> I had some problems adding dm and gism to their new locations in
> /gui/tcltk and didn't realize it until a few minutes ago. I think
> (hope) I've remedied this and they are in the cvs now.Michael, All,
I have fixed this yesterday (and my nice explanation emails somehow
did not make it to this list, so here is a brief version).
Yesterday (Saturday) one of the disks of grass.itc.it was full
(for some hours), so some emails must have come back. I fixed it
in the Italian afternoon.
To me it looked like Michael's CVS client did not work properly.
I have not moved the files, please make sure that you all check out/update
display/ and gui/ properly before new commits.As Michael has send my a tarball, I have added a bunch of new files
to gui/tcltk/gis.m/ that have not been in the old location.
One file I did NOT add was "copy tree.tcl" or so.Michael: I suggest that you rename this file to not contain
a space character before adding.CVS general insights:
The move could be done with regular cvs add and cvs remove commands.
This was better then moving files within the repository, because now
people can still check out old non-branch-tags and get the same files.Other:
When looking at new files, I have noticed that they do not contain
a hint towards the license and the right holder.
I suggest to add this as a standard header in addition to the author(s).
My memory tells me that we debated standard headers quite a while before
on this list.
Right. It is also documented in the SUBMITTING file, section (3).
Thing will become more standardized if/when we come up with a
Contributor Agreement.
Markus
Bernhard,
Again. Thanks.
A couple of clarifications. I did a cvs add and commit. I didn't move files.
I did copy them from my local /display directory to my local new /gui/tcltk/
directory before adding them but after adding the new directory to the cvs
(obviously I wouldn't rewrite them). But clearly it didn't work correctly.
I've done this before--recently--with no problems. But I've never done this
many files at one time. It doesn't make much sense to me, but maybe this was
the source of the source of the problem? It would be nice to know WHY the
add/commit didn't work this time so I could avoid a similar problem in the
future.
The files in the tarball I sent you should be the same as those that existed
in the original location. In fact, I simply copied my local versions of the
original directories into a backup directory (i.e., the one that I sent you)
prior to starting the process to add/commit, move/commit. The apparent
mismatch between the new and old locations is moot now in that the new
location is the place everyone should be working with.
Copy tree.tcl was a working file that was not supposed to end up in the cvs.
I deleted it when I did the add/commit to the new location (i.e., it was in
my backup but not the new location). But of course that didn't work right.
So I'm glad you did not add it either.
Thanks again for the emergency help.
Michael
__________________________________________
Michael Barton, Professor of Anthropology
School of Human Evolution and Social Change
Arizona State University
Tempe, AZ 85287-2402
phone: 480-965-6213
fax: 480-965-7671
www: http://www.public.asu.edu/~cmbarton
From: Bernhard Reiter <bernhard@intevation.de>
Date: Sun, 19 Feb 2006 19:57:54 +0100
To: <grass5@grass.itc.it>
Subject: Re: [GRASS5] dm and gism in the cvsOn Fri, Feb 17, 2006 at 02:17:35PM -0700, Michael Barton wrote:
I had some problems adding dm and gism to their new locations in
/gui/tcltk and didn't realize it until a few minutes ago. I think
(hope) I've remedied this and they are in the cvs now.Michael, All,
I have fixed this yesterday (and my nice explanation emails somehow
did not make it to this list, so here is a brief version).To me it looked like Michael's CVS client did not work properly.
I have not moved the files, please make sure that you all check out/update
display/ and gui/ properly before new commits.As Michael has send my a tarball, I have added a bunch of new files
to gui/tcltk/gis.m/ that have not been in the old location.
One file I did NOT add was "copy tree.tcl" or so.Michael: I suggest that you rename this file to not contain
a space character before adding.CVS general insights:
The move could be done with regular cvs add and cvs remove commands.
This was better then moving files within the repository, because now
people can still check out old non-branch-tags and get the same files.Other:
When looking at new files, I have noticed that they do not contain
a hint towards the license and the right holder.
I suggest to add this as a standard header in addition to the author(s).
My memory tells me that we debated standard headers quite a while before
on this list.Best,
Bernhard
On Sun, Feb 19, 2006 at 08:09:20PM +0100, Markus Neteler wrote:
On Sun, Feb 19, 2006 at 07:57:54PM +0100, Bernhard Reiter wrote:
> On Fri, Feb 17, 2006 at 02:17:35PM -0700, Michael Barton wrote:
> > I had some problems adding dm and gism to their new locations in
> > /gui/tcltk and didn't realize it until a few minutes ago. I think
> > (hope) I've remedied this and they are in the cvs now.
> I have fixed this yesterday (and my nice explanation emails somehow
> did not make it to this list, so here is a brief version).Yesterday (Saturday) one of the disks of grass.itc.it was full
(for some hours), so some emails must have come back. I fixed it
in the Italian afternoon.
The emails for commit and my explanation emails are gone,
at least they did not come back and I have not gotten notice.
For completeness, here is the explanation I have send
why this was best moved with CVS commands and not within the repository:
There are two principal methods, both will loose history in some way:
a) cvs add/import the new location and files as CVS user
cvs remove the old location and files
Will loose ability to cvs log/diff the new files,
for them you would need to go to the old ones.
Preserves history of the CVS tags. E.g. you can still
check out 6_0_0_release and get the right files.
b) have the repository administrator move the files
within the repository.
Will loose history of the CVS tags.
Preserves log ability on the moved files.
I am happy to fullfil b) if you tell me, which files should be moved where.
However from your description below, I would suggest using method a),
because there are no conflicts, and I consider the possibility of
a checkout of old tags for more important then removing the hassle
of going to the old files when examining history.
Michael,
On Sun, Feb 19, 2006 at 08:07:00PM -0700, Michael Barton wrote:
A couple of clarifications. I did a cvs add and commit. I didn't move files.
I did copy them from my local /display directory to my local new /gui/tcltk/
directory before adding them but after adding the new directory to the cvs
(obviously I wouldn't rewrite them). But clearly it didn't work correctly.
I've done this before--recently--with no problems. But I've never done this
many files at one time. It doesn't make much sense to me, but maybe this was
the source of the source of the problem? It would be nice to know WHY the
add/commit didn't work this time so I could avoid a similar problem in the
future.
cvs add and cvs remove are the right combination.
I think your problem was created by also copying over
the MacCVSClient hidden files/directories, so when your client
wanted to updated or commit them on the new location,
it was getting the location from its own subdirectories
and commited it to the old location.
Actually a client should prevent this.
If you want to improve the client, you could try to recreate the
situation on a playground CVS somewhere and report the bug to the author.
Run "ls -al" a lot to see the hidden files.
If you want to improve your changes of doing this right,
I suggest using the "raw" command line cvs commands for this,
they are not that hard to learn after all. 
The files in the tarball I sent you should be the same as those that existed
in the original location. In fact, I simply copied my local versions of the
original directories into a backup directory (i.e., the one that I sent you)
prior to starting the process to add/commit, move/commit. The apparent
mismatch between the new and old locations is moot now in that the new
location is the place everyone should be working with.
There were minor differences in one file, but I do not remember which one.
(With my emails vanished by the mailinglist problem.)
Copy tree.tcl was a working file that was not supposed to end up in the cvs.
I deleted it when I did the add/commit to the new location (i.e., it was in
my backup but not the new location). But of course that didn't work right.
So I'm glad you did not add it either.
Pure luck, I have added
dtext.gif
dtext.tcl
fttext.gif
fttext.tcl
though. They have not been in the old location.
Please check and remove them if necessary.
Bernhard