[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-i18n-doc
Subject:    Re: KDE tarballs released to the packagers
From:       Stephan Kulow <coolo () kde ! org>
Date:       2000-10-17 9:18:07
[Download RAW message or body]

Eric Bischoff wrote:
> 
> Hasso Tepper wrote:
> >
> > Thomas Diehl wrote:
> > > On Montag, 16. Oktober 2000 18:32, Sivakumar Shanmugasundaram wrote:
> > > > Does this mean, any further translations will not be
> > > > incorporated into KDE_2.0?
> > >
> > > Originally, I thought so. But another message said that we can still
> > > commit until Thursday:
> >
> > No, it means that our commits just will be in both CVS branches (HEAD and
> > KDE_2_0_BRANCH) in future.
> 
> Fine. And what in the improbable case we want to fix in just one of the
> two branches? After all, it's what branches are made for ;-). Can
> someone write down a brief howto?
> 
> One can imagine that we want to write the doc for some changes that are
> brought by KDE 2.0.1, for example. Or fix some markup in a paragraph
> that disappeared from KDE 2.0 to KDE 2.0.1.
> 
You only commit to one branch, if you want to commit to both, you
will have to do extra work.
You decide once on cvs update to use the 2_0 in using 
cvs update -r KDE_2_0_BRANCH. Unless you use cvs update -A, the update
will stick to this branch and commit will commit to this branch.
You should that's why commit without -m to see in which branch you're
commiting (if you don't know vi - use export EDITOR=emacs ;-)

So if you want to commit regulary to both branches, you better keep
two copies.

Greetings, Stephan

-- 
... but you ain't had mine

[prev in list] [next in list] [prev in thread] [next in thread]