linux-apus-devel

CVS

[Ken T. <ke...@we...>]

Hi,

I'm still on the bottom of the learning curve regarding all the CVS magic.

I'd like to ask how other people manage their own tree, how do you stay in
sync with the repositry *AND* still keep local work from being lost - like
my life time job on 53c7xx.c and related files ?

ken

Re: CVS

[Jesper S. <js...@re...>]

>>>>> "Ken" == Ken Tyler <ke...@we...> writes:

Ken> Hi,

Ken> I'm still on the bottom of the learning curve regarding all the
Ken> CVS magic.

Ken> I'd like to ask how other people manage their own tree, how do
Ken> you stay in sync with the repositry *AND* still keep local work
Ken> from being lost - like my life time job on 53c7xx.c and related
Ken> files ?

cvs update


Just regular cvs update. It will not cause local work to be
lost. Worst case it will try to merge your work with stuff from the
repository if the work affect the same lines of a file - but then it
will notify you of a conflict (C) and leave both versions in the file
marked by <<<<<<<<<<<< and >>>>>>>>>>>>>.

Still, it's a good idea to do occasional diffs (cvs diff -u) and keep
them around (backups).

Jesper

Re: CVS

[Geert U. <ge...@li...>]

On 28 May 2000, Jesper Skov wrote:
> Ken> I'd like to ask how other people manage their own tree, how do
> Ken> you stay in sync with the repositry *AND* still keep local work
> Ken> from being lost - like my life time job on 53c7xx.c and related
> Ken> files ?
> 
> cvs update

`cvs -z3 update -d', to enable compression and create new directories.

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@li...

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Re: CVS

[Ken T. <ke...@we...>]

On Mon, 29 May 2000, Geert Uytterhoeven wrote:

> `cvs -z3 update -d', to enable compression and create new directories.

Worked out the -d was required to create new/missing directories after a
few tries.  Was more concerned about losing my local changes.

Ken.

Re: CVS

[Ken T. <ke...@we...>]

On 28 May 2000, Jesper Skov wrote:

> Just regular cvs update. It will not cause local work to be
> lost. Worst case it will try to merge your work with stuff from the
> repository if the work affect the same lines of a file - but then it
> will notify you of a conflict (C) and leave both versions in the file
> marked by <<<<<<<<<<<< and >>>>>>>>>>>>>.

Hello,

'C' ?

Is this is one of the characters on the start of each line ?
 
> Still, it's a good idea to do occasional diffs (cvs diff -u) and keep
> them around (backups).

OK

ken.

Re: CVS

[Geert U. <ge...@li...>]

On Mon, 29 May 2000, Ken Tyler wrote:
> On 28 May 2000, Jesper Skov wrote:
> > lost. Worst case it will try to merge your work with stuff from the
> > repository if the work affect the same lines of a file - but then it
> > will notify you of a conflict (C) and leave both versions in the file
> > marked by <<<<<<<<<<<< and >>>>>>>>>>>>>.
> 
> Hello,
> 
> 'C' ?
> 
> Is this is one of the characters on the start of each line ?

Yes, `C' means conflict.

IIRC, there's a good tutorial on CVS at http://www.cyclic.com/.

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@li...

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Re: CVS

[<fp...@zu...>]

On Mon, May 29, 2000 at 06:59:55AM +1000, Ken Tyler wrote:
> I'd like to ask how other people manage their own tree, how do you stay in
> sync with the repositry *AND* still keep local work from being lost - like
> my life time job on 53c7xx.c and related files ?

You can split off a branch (cvs tag -b ken_tylers_53c7xx_changes) and
cvs upd -r ken_tylers_53c7xx_changes

And then work with the repository as normal. Your commits will not disturb
anybody else that checks out the trunk. If the changes are stable enough to 
go into "public" you can merge them into the trunk.

Of course, if somebody wants to work with your changes, he can checkout
your branch, too.

I propose a branch for every "project" e.g. CV64/3D driver, 53c7xx.c, ect.
-- 
Frank Petzold, IBM Zurich Research Laboratory, Säumerstrasse 4,
CH-8803 Rüschlikon/Switzerland, Tel.  +41-1-724-84-42  Fax.   +41-1-724-89-56
 Business email: fp...@zu...          Private email: pe...@he...
   The opinions expressed here are mine and not necessarily those of IBM.

CVS (branches) [Re: CVS]

[Jesper S. <js...@re...>]

>>>>> "Frank" == Frank Petzold <fp...@zu...> writes:

Frank> On Mon, May 29, 2000 at 06:59:55AM +1000, Ken Tyler wrote:
>> I'd like to ask how other people manage their own tree, how do you
>> stay in sync with the repositry *AND* still keep local work from
>> being lost - like my life time job on 53c7xx.c and related files ?

Frank> You can split off a branch (cvs tag -b
Frank> ken_tylers_53c7xx_changes) and cvs upd -r
Frank> ken_tylers_53c7xx_changes

Everybody having write access to the CVS tree should start by reading
some CVS manuals. It's a reasonable requirement!

Second, at Cygnu^H^H^H^H^HRed Hat we tag the tree before making a
branch. I suspect because it makes it easier to pinpoint what went
into a branch (the kind of information you'll only ever need if you
didn't tag the tree). This is how we do it:


cvs tag ken_tylers_53c7xx_changes-branchpoint
cvs tag -b ken_tylers_53c7xx_changes-branch

Remember to be at the top of the tree when doing this.

Jesper

Re: CVS (branches) [Re: CVS]

[Ken T. <ke...@we...>]

On 29 May 2000, Jesper Skov wrote:

Hello Jesper,

> Everybody having write access to the CVS tree should start by reading
> some CVS manuals. It's a reasonable requirement!

Good idea, but don't panic, I'm only doing anonymous access so I can't do
any damage, at least not to the repositry...

I'll have a read of the URL Geert suggested.

> cvs tag ken_tylers_53c7xx_changes-branchpoint
> cvs tag -b ken_tylers_53c7xx_changes-branch

Ahhhggg ! more reading req'd.

ken.

CVS on SourceForge

[Alan B. <al...@ms...>]

hi,

what modules are there on the CVS-tree now.. (is there a CVS command to
find out, sorry if there is!)  ?

I'm checking out the current 2.2 and 2.3 trees. is the '2.4' under 2.3
or is there a 2.4 tree now?

alan

Re: CVS on SourceForge

[Michel <dae...@st...>]

Alan Buxey wrote:

> what modules are there on the CVS-tree now.. (is there a CVS command to
> find out, sorry if there is!)  ?

Go to the CVS page on SourceForge, then follow 'Browse the Repository'. The
top level directories are the modules.


> I'm checking out the current 2.2 and 2.3 trees. is the '2.4' under 2.3
> or is there a 2.4 tree now?

The former.


Michel


-- 
Do I look like a freakin' people person?
______________________________________________________________________________
Earthling Michel Dänzer (MrCooper)  \  CS student and free software enthusiast
Debian GNU/Linux (powerpc,i386) user \   member of XFree86, Team *AMIGA*, AUGS

Re: CVS

[Michel <dae...@st...>]

Frank Petzold wrote:

> You can split off a branch (cvs tag -b ken_tylers_53c7xx_changes) and
> cvs upd -r ken_tylers_53c7xx_changes
> 
> And then work with the repository as normal. Your commits will not disturb
> anybody else that checks out the trunk. If the changes are stable enough to
> go into "public" you can merge them into the trunk.

Do changes to the trunk get applied to the branch?


> I propose a branch for every "project" e.g. CV64/3D driver, 53c7xx.c, ect.

Should we announce when we start a branch?


Another thing I wonder about: Would it be reasonable to let CVS post to this
list automatically upon each commit?


Michel, who wishes his posts wouldn't only contain questions :)


-- 
The computer revolution is over. The computers won.
______________________________________________________________________________
Earthling Michel Dänzer (MrCooper)  \  CS student and free software enthusiast
Debian GNU/Linux (powerpc,i386) user \   member of XFree86, Team *AMIGA*, AUGS

Re: CVS

[Frank P. <fp...@zu...>]

On Mon, May 29, 2000 at 10:34:39AM +0200, Michel Dänzer wrote:
> Do changes to the trunk get applied to the branch?

You can merge them.

> Should we announce when we start a branch?

No, we need to announce before merging.
-- 
Frank Petzold, IBM Zurich Research Laboratory, Säumerstrasse 4,
CH-8803 Rüschlikon/Switzerland, Tel.  +41-1-724-84-42  Fax.   +41-1-724-89-56
 Business email: fp...@zu...          Private email: pe...@he...
   The opinions expressed here are mine and not necessarily those of IBM.

Re: CVS

[Geert U. <ge...@li...>]

On Mon, 29 May 2000, Michel Dänzer wrote:
> > I propose a branch for every "project" e.g. CV64/3D driver, 53c7xx.c, ect.
> 
> Should we announce when we start a branch?
> 
> 
> Another thing I wonder about: Would it be reasonable to let CVS post to this
> list automatically upon each commit?

Yes, so people know when something changed. This is also done for the vger CVS
repository at spa...@vg....

Either we create a new list (linux-apus-cvs) for it, or just use
linux-apus-devel for that?

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@li...

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Re: CVS

[Michel <dae...@st...>]

Geert Uytterhoeven wrote:

> > Another thing I wonder about: Would it be reasonable to let CVS post to
> > this list automatically upon each commit?
> 
> Yes, so people know when something changed. This is also done for the vger
> CVS repository at spa...@vg....
> 
> Either we create a new list (linux-apus-cvs) for it, or just use
> linux-apus-devel for that?

I vote for the latter.


Michel


-- 
I don't suffer from stress. I'm a carrier.
______________________________________________________________________________
Earthling Michel Dänzer (MrCooper)  \  CS student and free software enthusiast
Debian GNU/Linux (powerpc,i386) user \   member of XFree86, Team *AMIGA*, AUGS

Re: CVS

[Michel <dae...@st...>]

Frank Petzold wrote:
> 
> On Mon, May 29, 2000 at 10:34:39AM +0200, Michel Dänzer wrote:
> > Do changes to the trunk get applied to the branch?
> 
> You can merge them.

But unless one merges them, the branch 'stands still' except for the files one
works on?


> > Should we announce when we start a branch?
> 
> No, we need to announce before merging.

Alright.


Michel


-- 
Pauli's exclusive, Heisenberg's uncertain, and Schroedinger just waves.
______________________________________________________________________________
Earthling Michel Dänzer (MrCooper)  \  CS student and free software enthusiast
Debian GNU/Linux (powerpc,i386) user \   member of XFree86, Team *AMIGA*, AUGS

Re: CVS

[Geert U. <ge...@li...>]

On Mon, 29 May 2000, Michel Dänzer wrote:
> Frank Petzold wrote:
> > On Mon, May 29, 2000 at 10:34:39AM +0200, Michel Dänzer wrote:
> > > Do changes to the trunk get applied to the branch?
> > 
> > You can merge them.
> 
> But unless one merges them, the branch 'stands still' except for the files one
> works on?

Yes. Your own branch doesn't track changes on the main branch. You have to
explicitly merge them from the main branch to your own branch.

And when everything is finished and working, you merge back your branch to the
main branch (trivial, since you first merged the main branch to your own
branch).

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@li...

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds