[parisc-linux] cvs directory renaming - *action required*

[parisc-linux] cvs directory renaming - *action required*

[Michael Ang]

In order to reduce some of the confusion about which directory was
active in the repository (did I want "binutils", "binutils-old", or
"binutils-2.10"?) some of the directories in the repository will be
renamed.  This will be moderately painful, but it's better to do the
painful thing now while we can still stamp out the old cruft.

"linux-2.3" will be renamed to "linux"
"binutils-2.10" will be renamed to "binutils"

If you currently have a tree checked out, you will need to change all of
your CVS/Repository files to point to the new directory names.  With
bash you can do it like this:
$ cd linux-2.3
$ for i in `find . -name Repository`; do echo "linux" > $i; done
$ cd binutils-2.10
$ for i in `find . -name Repository`; do echo "binutils" > $i; done

You can do this now, since there is a symlink set up to support both
names.  The alias for the old name will be removed Wednesday.  If you do
not hack your tree by then you won't be able to play (update, checkout,
etc) until you have the right repository entries.

Can someone please update the recipe and cvs info on
www.thepuffingroup.com/parisc?  Until the docs are updated, you can
mentally substitute "linux" for "linux-2.3" and "binutils" for
"binutils-2.10".

These should be the last directory games we play in the repository. 
After this, new vendor versions should be checked into the existing
directories (on a branch).  This will reduce the confusion from using
directory names for version control.

	- Mike.

P.S. If out of archeological interest you're looking for the old {linux,
binutils, binutils-old, egcs-old} directory, it's been moved under
directory "obsolete". e.g. "cvs co obsolete/binutils-old".

Re: [parisc-linux] cvs directory renaming - *action required*

[Alan Modra]

On Fri, 22 Sep 2000, Michael Ang wrote:

> "linux-2.3" will be renamed to "linux"
> "binutils-2.10" will be renamed to "binutils"
> 
> If you currently have a tree checked out, you will need to change all of
> your CVS/Repository files to point to the new directory names.  With
> bash you can do it like this:
> $ cd linux-2.3
> $ for i in `find . -name Repository`; do echo "linux" > $i; done
> $ cd binutils-2.10
> $ for i in `find . -name Repository`; do echo "binutils" > $i; done

Errm, will this work?  My linux-2.3/CVS/Repository file looks like this:
/home/cvs/parisc/linux-2.3
and linux-2.3/CVS/arch/Repository has
/home/cvs/parisc/linux-2.3/arch

I wasn't game to try the above, and instead used

cd linux-2.3
for z in `find . -name Repository`
do
  sed -e 's/-2.3//' $z > zzz && mv zzz $z
done

with a simliar trick for binutils.

-- 
Linuxcare.  Support for the Revolution.

Re: [parisc-linux] cvs directory renaming - *action required*

[Michael Ang]

No, what I gave will not work and is in fact *horribly wrong*.  I would
recommend that people use Alan's script fragment instead ;)

	- Mike.

Alan Modra wrote:
> 
> On Fri, 22 Sep 2000, Michael Ang wrote:
> 
> > "linux-2.3" will be renamed to "linux"
> > "binutils-2.10" will be renamed to "binutils"
> >
> > If you currently have a tree checked out, you will need to change all of
> > your CVS/Repository files to point to the new directory names.  With
> > bash you can do it like this:
> > $ cd linux-2.3
> > $ for i in `find . -name Repository`; do echo "linux" > $i; done
> > $ cd binutils-2.10
> > $ for i in `find . -name Repository`; do echo "binutils" > $i; done
> 
> Errm, will this work?  My linux-2.3/CVS/Repository file looks like this:
> /home/cvs/parisc/linux-2.3
> and linux-2.3/CVS/arch/Repository has
> /home/cvs/parisc/linux-2.3/arch
> 
> I wasn't game to try the above, and instead used
> 
> cd linux-2.3
> for z in `find . -name Repository`
> do
>   sed -e 's/-2.3//' $z > zzz && mv zzz $z
> done
> 
> with a simliar trick for binutils.
> 
> --
> Linuxcare.  Support for the Revolution.

Re: [parisc-linux] cvs directory renaming - *action required*

[Andrew Shugg]

Michael Ang said:
> In order to reduce some of the confusion about which directory was
> active in the repository (did I want "binutils", "binutils-old", or
> "binutils-2.10"?) some of the directories in the repository will be
> renamed.  This will be moderately painful, but it's better to do the
> painful thing now while we can still stamp out the old cruft.
> 
> "linux-2.3" will be renamed to "linux"
> "binutils-2.10" will be renamed to "binutils"
> 
> If you currently have a tree checked out, you will need to change all of
> your CVS/Repository files to point to the new directory names.  With
> bash you can do it like this:

This file "binutils-2.10/gas/testsuite/gas/cris/CVS/Repository" doesn't
contain a full repository path - all the others are /home/cvs/... but
this one contains just the relative path.  Not sure what this means, if
anything...  Some of the Repository files in the linux-2.3 module have
the same sort of thing.  *shrug*  Anyone know?  =)

> $ cd linux-2.3
> $ for i in `find . -name Repository`; do echo "linux" > $i; done
> $ cd binutils-2.10
> $ for i in `find . -name Repository`; do echo "binutils" > $i; done

$ for i in $(find linux-2.3 binutils-2.10 -name Repository); do echo $(cat $i|sed 's/-[0-9.]*//') > $i; done

> P.S. If out of archeological interest you're looking for the old {linux,
> binutils, binutils-old, egcs-old} directory, it's been moved under
> directory "obsolete". e.g. "cvs co obsolete/binutils-old".

Why do this?  Why not just tag those two modules on Wednesday when you
make the change to the repository structure?

Andrew.

--
Andrew Shugg <andrew@neep.com.au>                http://www.neep.com.au/

  "Just remember Basil, there's always someone worse off than yourself."
  "Oh, really?  I'd like to meet him ... I could do with a good laugh."
                 [ Sybil and Basil Fawlty, "Fawlty Towers" ]

Re: [parisc-linux] cvs directory renaming - *action required*

[Michael Ang]

Andrew Shugg wrote:
> 
> $ for i in $(find linux-2.3 binutils-2.10 -name Repository); do echo $(cat $i|sed 's/-[0-9.]*//') > $i; done

This is also incorrect since you'll replace any dashes that appear.  You
want this:
cd binutils-2.10
for z in `find . -name Repository`
do
  sed -e 's/-2.10//' $z > zzz && mv zzz $z
done

> > P.S. If out of archeological interest you're looking for the old {linux,
> > binutils, binutils-old, egcs-old} directory, it's been moved under
> > directory "obsolete". e.g. "cvs co obsolete/binutils-old".
> 
> Why do this?  Why not just tag those two modules on Wednesday when you
> make the change to the repository structure?

Because "linux-2.3" is being renamed to "linux", so the old "linux" had
to go.  The stuff being moved is very old, and is being moved out of the
way to reduce the amount of cruft in the top level of the repository. 
This should be the last time we have to do this.  After the rename, no
new directories should be created unless absolutely necessary: branches
should be used instead.

	- Mike.

Re: [parisc-linux] cvs directory renaming - *action required*

[Andrew Shugg]

Is anyone having trouble doing updates after the rename?

Not having any troubles with the binutils module but bombing out on
linux ...

cvs server: Updating linux/arch/alpha/math-emu
cvs [server aborted]: cannot open directory /home/cvs/parisc/linux/arch/alpha/mathemu: No such file or directory


Andrew.

--
Andrew Shugg <andrew@neep.com.au>                http://www.neep.com.au/

  "Just remember Basil, there's always someone worse off than yourself."
  "Oh, really?  I'd like to meet him ... I could do with a good laugh."
                 [ Sybil and Basil Fawlty, "Fawlty Towers" ]

Re: [parisc-linux] cvs directory renaming - *action required*

[Michael Ang]

This is because of a problem in your sed pattern.  Notice the mismatch
between "math-emu" and "mathemu".  You can hand edit your CVS/Repository
to be correct (add the dash back).

Playing directory games in the repository is always a bad scene.  But
there was a desire to get rid of the junk in the repository, and better
to pay the price now than have the old directories become entrenched. :/

	- Mike.

Andrew Shugg wrote:
> 
> Is anyone having trouble doing updates after the rename?
> 
> Not having any troubles with the binutils module but bombing out on
> linux ...
> 
> cvs server: Updating linux/arch/alpha/math-emu
> cvs [server aborted]: cannot open directory /home/cvs/parisc/linux/arch/alpha/mathemu: No such file or directory

Re: [parisc-linux] cvs directory renaming - *action required*

[Andrew Shugg]

Andrew Shugg said:
> Is anyone having trouble doing updates after the rename?
> 
> Not having any troubles with the binutils module but bombing out on
> linux ...
> 
> cvs server: Updating linux/arch/alpha/math-emu
> cvs [server aborted]: cannot open directory /home/cvs/parisc/linux/arch/alpha/mathemu: No such file or directory

Yep, my bad: thanks for sorting me out Mike.  =)

Andrew.

--
Andrew Shugg <andrew@neep.com.au>                http://www.neep.com.au/

  "Just remember Basil, there's always someone worse off than yourself."
  "Oh, really?  I'd like to meet him ... I could do with a good laugh."
                 [ Sybil and Basil Fawlty, "Fawlty Towers" ]

Re: [parisc-linux] cvs directory renaming - *action required*

[Matthew Wilcox]

On Fri, Sep 22, 2000 at 08:29:10PM -0400, Michael Ang wrote:
> Can someone please update the recipe and cvs info on
> www.thepuffingroup.com/parisc?  Until the docs are updated, you can
> mentally substitute "linux" for "linux-2.3" and "binutils" for
> "binutils-2.10".

cvs co website, then make your changes and commit them back.  Next time
someone with the password updates the website, your changes will
appear too.

(typing make will create the .html files from the .x files so you
can check your changes.  Since mid-July, you haven't needed anything
special installed; date, cat, echo, make, mkdir... no silly binary-only
software :-)

I have some ideas for how to improve the website, but I'm going to
wait and see what the Linuxcare web team come up with before I make
any structural changes.

-- 
Revolutions do not require corporate support.

Re: [parisc-linux] cvs directory renaming - *action required*

[Erik Paulson]

On Fri, Sep 22, 2000 at 08:29:10PM -0400, Michael Ang wrote:
> In order to reduce some of the confusion about which directory was
> active in the repository (did I want "binutils", "binutils-old", or
> "binutils-2.10"?) some of the directories in the repository will be
> renamed.  This will be moderately painful, but it's better to do the
> painful thing now while we can still stamp out the old cruft.
> 
> "linux-2.3" will be renamed to "linux"
> "binutils-2.10" will be renamed to "binutils"

The nightly CVS snapshots still have linux-2.3...

-Erik

Re: [parisc-linux] cvs directory renaming - *action required*

[Michael Ang]

The cvs tarballs on the ftp site are owned by user "adevries".  From
this I guess that Alex has a cron job that packages the tarballs.

Alex, can you please update your scripts?

	- Mike.

Erik Paulson wrote:
> 
> On Fri, Sep 22, 2000 at 08:29:10PM -0400, Michael Ang wrote:
> > "linux-2.3" will be renamed to "linux"
> > "binutils-2.10" will be renamed to "binutils"
> 
> The nightly CVS snapshots still have linux-2.3...

Re: [parisc-linux] cvs directory renaming - *action required*

[Matthew Wilcox]

On Mon, Sep 25, 2000 at 01:57:09PM -0400, Michael Ang wrote:
> The cvs tarballs on the ftp site are owned by user "adevries".  From
> this I guess that Alex has a cron job that packages the tarballs.
> 
> Alex, can you please update your scripts?

Now that Matt's buildtools are in CVS, this script should probably also
be in CVS, and it should be run by user `al-76'.  (the significance of
this name may be noted by some of you :-)

-- 
Revolutions do not require corporate support.

Re: [parisc-linux] cvs directory renaming - *action required*

[Matt Taggart]

Matthew Wilcox writes...

> On Mon, Sep 25, 2000 at 01:57:09PM -0400, Michael Ang wrote:
> > The cvs tarballs on the ftp site are owned by user "adevries".  From
> > this I guess that Alex has a cron job that packages the tarballs.
> > 
> > Alex, can you please update your scripts?
> 
> Now that Matt's buildtools are in CVS, this script should probably also
> be in CVS, and it should be run by user `al-76'.  (the significance of
> this name may be noted by some of you :-)

Good idea. I'll move it over once we're moved over to the new system.

-- 
Matt Taggart
taggart@fc.hp.com