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

List:       kde-devel
Subject:    Re: [Kde-scm-interest] kdenetwork Git migration
From:       Pali =?utf-8?q?Roh=C3=A1r?= <pali.rohar () gmail ! com>
Date:       2013-06-12 11:05:03
Message-ID: 201306121305.03596 () pali
[Download RAW message or body]

[Attachment #2 (multipart/signed)]


On Monday 10 June 2013 00:08:24 you wrote:
> El Diumenge, 9 de juny de 2013, a les 13:54:11, Pali Rohár va escriure:
> > On Sunday 09 June 2013 13:06:30 Albert Astals Cid wrote:
> > > Ok, i had not understood what you meant here until now.
> > > 
> > > And it's bad, you shouldn't do that.
> > > 
> > > I understand that there may be some common history between
> > > the plugins and the rest of the repo, but having
> > > different codebases in the same repo under different
> > > branches is not good.
> > > 
> > > But right now the kopete repo is a mess where there are
> > > diverging branches both active as development, so 'master'
> > > gets "kopete development" and 'plugin- cryptography' gets
> > > "cryptography developemtn" and 'plugin-cryptography-doc'
> > > gets "doc cryptography developemtn", etc.
> > > 
> > > This is not how we use gut, each repo has various branches
> > > but they are all "the same code", your setup may work for
> > > you (and of course it's a valid way to use git), but it's
> > > breaking all the use cases for scripts, tools and
> > > understandings of "how things work" that we in KDE have
> > > been setting up in the past.
> > > 
> > > I'd sincerely appreciate if you could make each thing that
> > > has it's own entity have it's separate own repo.
> > > 
> > > Cheers,
> > > 
> > >   Albert
> > 
> > Hello Albert,
> > 
> > here is status of each "plugin" branch in kopete:
> > 
> > * plugin-cryptography-doc
> > This is only temporary branch, because it was hard to write
> > rules for svn2git... and this will be merged into
> > plugin-cryptography.
> > 
> > * plugin-cryptography
> > This branch contains cryptography plugin. All problems were
> > fixed and this plugin is stable again. So it will be merged
> > to master (if nobody will be against) after 4.11 branch
> > will be created (so it will not be part of 4.11).
> > 
> > * protocol-skype-kde3 and protocol-skype-kde3-stable
> > These branches contains historic kde3 version of skype
> > plugin. kde4 version is based on this branch (and merged
> > into master), but not based on last commit. There is no
> > future development for kde3 plugin, so it does not make
> > sense to move it to new git repo.
> > 
> > * protocol-telepathy
> > This situation is quite complicated and this branch needs to
> > be removed, replaced or merged with version which is in
> > this repo:
> > http://quickgit.kde.org/?p=kopete-protocol-telepathy.git I
> > will ask maintainers of that repo, what to do...
> 
> Okidoki
> 
> > * plugin-smpppdcs
> > This is the only one candidate for separate repo. Albert, I
> > can request for playground/network repository and move it
> > he.
> 
> Yes please.
> 
> Ok, so two branches that are "work in progress" to be merged
> to master, one that is historic and noone cares about and two
> that need to be "sorted" out.
> 
> Thanks, all is clearer now :-)
> 
> Cheers,
>   Albert

Branch plugin-smpppdcs was moved to new git repo on:
https://projects.kde.org/projects/playground/network/kopete-smpppdcs/repository

-- 
Pali Rohár
pali.rohar@gmail.com

["signature.asc" (application/pgp-signature)]

>> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<


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