Jean-Marc Lasgouttes <[EMAIL PROTECTED]> writes:

| >>>>> "Lars" == Lars Gullik Bjønnes <[EMAIL PROTECTED]> writes:
| 
| Lars> You could even have something called "Jean-Marcs-branch" where
| Lars> you could do all your work and then just merge it when you thing
| Lars> the code is ready for it.
| 
| What I have to understand is how I could make my branch include main
| branch changes (for my own testing and use), while avoiding to pollute
| the main branch. This is probably possible, I just have to learn how.

Sure.

When in "your" branch you can do a "cvs update -j HEAD" and you will
get all changes made to the main branch into your branch.

similar when you are satisfied with your changes you can merge them
into the main branch with "cvs update -j <name of your branch>"...but
this is only almost good enough...

Preferably befor merging something into the main branch...especially
if you plan to continue developmet in "your" branch...you should make
a symbolic tag. but I don't want to teach you all of this: Read The
Fine Manual please :-) And if you don't have it I can send it to you.

        Lgb

Reply via email to