From: Zoltan P. <zol...@gm...> - 2009-11-17 13:13:16
|
The topic in the subject should be also discussed. I've never worked yet with either one, but SVN has some shortcomings -- for example is hard to track code changes. Compatibility with KDE could be a bonus. Julian worked with git on kde4 port. Note, comments, opinions? |
From: Matthew A. <sol...@gm...> - 2009-11-17 13:17:40
|
I'm just dropping in my vote for git, mainly because I know fractionally more about it than I do about mercurial. I've mainly used CVS before, but I'm not one to advocate it particularly. On Tue, Nov 17, 2009 at 1:13 PM, Zoltan Padrah <zol...@gm...>wrote: > The topic in the subject should be also discussed. I've never worked yet > with either one, but SVN has some shortcomings -- for example is hard to > track code changes. > > Compatibility with KDE could be a bonus. > > Julian worked with git on kde4 port. > > Note, comments, opinions? > > > > ------------------------------------------------------------------------------ > Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day > trial. Simplify your report design, integration and deployment - and focus > on > what you do best, core application coding. Discover what's new with > Crystal Reports now. http://p.sf.net/sfu/bobj-july > _______________________________________________ > Ktechlab-devel mailing list > Kte...@li... > https://lists.sourceforge.net/lists/listinfo/ktechlab-devel > > |
From: Julian B. <ju...@sv...> - 2009-11-17 18:01:00
|
On Tuesday 17 November 2009 14:13:00 Zoltan Padrah wrote: > The topic in the subject should be also discussed. I've never worked yet > with either one, but SVN has some shortcomings -- for example is hard to > track code changes. > > Compatibility with KDE could be a bonus. kde still uses svn. Qt uses git, first applications (amarok as one of the more-known projects) converted their repositories to git and there are discussions to move whole kde to git. > Julian worked with git on kde4 port. yes, that's why I vote for git ;) since it's really nice to work with this tool in a group. I'll write about one suggestion on how to organise our source with git, later. Another comment is: sf.net should allow us to run both systems for a while, right? So we could just switch it on, for a while and have a try. I'm willing (and already doing so) to keep the git repo in sync with the svn. bye then julian |
From: Julian B. <ju...@sv...> - 2009-11-18 14:30:34
|
On Tuesday 17 November 2009 18:57:47 Julian Bäume wrote: > since it's really nice to work with this > tool in a group. I'll write about one suggestion on how to organise our > source with git, later. okay, finished: https://sourceforge.net/apps/mediawiki/ktechlab/index.php?title=Getting_the_source Any comments are welcome bye then julian |
From: Alan G. <ag...@sp...> - 2009-11-18 16:44:26
|
Julian Bäume wrote: > On Tuesday 17 November 2009 18:57:47 Julian Bäume wrote: >> since it's really nice to work with this >> tool in a group. I'll write about one suggestion on how to organise our >> source with git, later. > okay, finished: > https://sourceforge.net/apps/mediawiki/ktechlab/index.php?title=Getting_the_source > Any comments are welcome The site is password protected. I get a login challenge on loading the page. Actually, it's been several years since I attempted to log into my sourceforge.net account and I don't even know what my login ID is at this point. I think Zoltan mentioned giving me additional privliges the other day... Well thanks... Now could you tell me what my login ID is so I can begin the account recovery process? -- Even as someone who avoids forums and uses the same absurdly weak password everywhere, I still have lots of trouble keeping track of all these accounts, especially ones I rarely use! =P -- DO NOT USE OBAMACARE. DO NOT BUY OBAMACARE. Powers are not rights. |
From: Matthew A. <sol...@gm...> - 2009-11-18 19:15:52
|
> Actually, it's been several years since I attempted to log into my > sourceforge.net account and I don't even know what my login ID is at > this point. I think Zoltan mentioned giving me additional privliges the > other day... Well thanks... Now could you tell me what my login ID is so > I can begin the account recovery process? -- Even as someone who avoids > forums and uses the same absurdly weak password everywhere, I still have > lots of trouble keeping track of all these accounts, especially ones I > rarely use! =P NB: I too have this problem. So, I guess I'll create a new user name, as I had never used my old one for KTechLab anyway. |
From: P Z. <zol...@gm...> - 2009-11-18 16:52:46
|
On Wed, 18 Nov 2009 17:37:58 +0100, Alan Grimes <ag...@sp...> wrote: > Julian Bäume wrote: >> On Tuesday 17 November 2009 18:57:47 Julian Bäume wrote: >>> since it's really nice to work with this >>> tool in a group. I'll write about one suggestion on how to organise our >>> source with git, later. >> okay, finished: >> https://sourceforge.net/apps/mediawiki/ktechlab/index.php?title=Getting_the_source > >> Any comments are welcome > > The site is password protected. I get a login challenge on loading the > page. It can be read if cancel the authentication or use simple http:// > > Actually, it's been several years since I attempted to log into my > sourceforge.net account and I don't even know what my login ID is at > this point. I think Zoltan mentioned giving me additional privliges the > other day... Well thanks... Now could you tell me what my login ID is so > I can begin the account recovery process? Try "alonzotg" > -- Even as someone who avoids > forums and uses the same absurdly weak password everywhere, I still have > lots of trouble keeping track of all these accounts, especially ones I > rarely use! =P > You could write that data down to some paper, and store it in a secure place. |
From: Julian B. <ju...@sv...> - 2009-11-18 17:05:15
|
On Wednesday 18 November 2009 18:55:15 P Zoltan wrote: > On Wed, 18 Nov 2009 17:37:58 +0100, Alan Grimes <ag...@sp...> > > -- Even as someone who avoids > > forums and uses the same absurdly weak password everywhere, I still have > > lots of trouble keeping track of all these accounts, especially ones I > > rarely use! =P > > You could write that data down to some paper, and store it in a secure > place. Since some month, I'm quite happy using keepassx. A really nice password manager (cross-platform) bye julian |
From: P Z. <zol...@gm...> - 2009-11-18 17:22:12
|
On Wed, 18 Nov 2009 15:27:35 +0100, Julian Bäume <ju...@sv...> wrote: > On Tuesday 17 November 2009 18:57:47 Julian Bäume wrote: >> since it's really nice to work with this >> tool in a group. I'll write about one suggestion on how to organise our >> source with git, later. > okay, finished: > https://sourceforge.net/apps/mediawiki/ktechlab/index.php?title=Getting_the_source > > Any comments are welcome > > bye then > julian Changed the links from https:// to http://, so no login needed to access them. This way of management it looks ok for me. We should define the way to access the upstream repository. Also I couldn't find any documentation about the usage of multiple source code management systems for sourceforge. |
From: Julian B. <ju...@sv...> - 2009-11-18 17:59:11
|
On Wednesday 18 November 2009 19:24:45 P Zoltan wrote: > We should define the way to access the upstream repository. IMHO, we should handle upstream just as we do with SVN at the moment. git is about distribution. This means, every copy (in git terms: clone) is it's own repository. You can sync between different repositories very easy. This is done by "push"ing or "pull"ing (depends on the direction). This upstream repository is designated as "our truth". Every development is done based on branches from the upstream repository. This means, every developer should make sure, patches apply without problems against the upstream branch, before requesting a merge. Distribution works, if we find a consensus on how to deal with patches. This "upstream"-approach is a useful pattern, how to solve this problem. Technically it's a simple repository like all the others out there, but if we agree it to be the central repository, it would be less pain merging from all different sources. I admit, it takes some time, to get used to this form of source-code management. I am using it heavily for about a year, now. The first few weeks were somewhat frustrating, because I had many questions and some problems :) But now, I don't want to give it up, again. > Also I couldn't find any documentation about the usage of multiple source > code management systems for sourceforge. Mhh, why should sf.net bother about this? If I had implemented it, there would be an option: add SCM and remove SCM. Just like you add or remove hosted-apps. I don't want the SVN repository to be deleted, so we maybe should ask some sf.net staff, if it's possible and how to proceed. bye julian |
From: Julian B. <ju...@sv...> - 2009-11-18 18:21:16
|
On Wednesday 18 November 2009 18:56:15 Julian Bäume wrote: > > Also I couldn't find any documentation about the usage of multiple source > > code management systems for sourceforge. > Mhh, why should sf.net bother about this? If I had implemented it, there > would be an option: add SCM and remove SCM. Just like you add or remove > hosted-apps. I don't want the SVN repository to be deleted, so we maybe > should ask some sf.net staff, if it's possible and how to proceed. okay, I just visited the sf.net help channel in IRC and somebody of their support-staff told me, that it is possible to have "as many SCMs as you want enabled at the same time". bye julian |
From: P Z. <zol...@gm...> - 2009-11-18 18:43:22
|
On Wed, 18 Nov 2009 19:18:21 +0100, Julian Bäume <ju...@sv...> wrote: > On Wednesday 18 November 2009 18:56:15 Julian Bäume wrote: >> > Also I couldn't find any documentation about the usage of multiple >> source >> > code management systems for sourceforge. >> Mhh, why should sf.net bother about this? If I had implemented it, there >> would be an option: add SCM and remove SCM. Just like you add or remove >> hosted-apps. I don't want the SVN repository to be deleted, so we maybe >> should ask some sf.net staff, if it's possible and how to proceed. > okay, I just visited the sf.net help channel in IRC and somebody of their > support-staff told me, that it is possible to have "as many SCMs as you > want > enabled at the same time". Good, so this question is cleared. Should I enable the git now? > > bye > julian |
From: Julian B. <ju...@sv...> - 2009-11-18 20:39:24
|
On Wednesday 18 November 2009 20:45:54 P Zoltan wrote: > Good, so this question is cleared. > Should I enable the git now? I'm in. The sf.net wiki says, default repo-name will be like the project's unix groupname. I guess, ktechlab that is. We should use this one as upstream, since every user might at first try the standard configuration. As I told you, I already synced my repository against SVN. I think this is ready to go upstream as it is. (Since I never changed a thing to any of these branches). Have a look here: https://krtek.asta.uni-luebeck.de/repos/KTechLab/ There you can see 3 branches. Master is the branch representing SVN trunk and ktechlab-0.3.7 obviously represents SVN branches/ktechlab-0.3.7. Since there is no real 0.3.6 branch in SVN, I didn't copy more. There are 2 special branches, that have not been in use for 2 years and the other one 20month, I know that at least one of them isn't needed any longer ;) I also tagged the 0.3.6 release commit, but haven't done so for 0.3.7. I think, the kde4-playground branch should not be upstream (I commited some crap for testing purposes). I'll come up with a better one, based on master, to provide a starting point for porting. bye then julian |
From: Jason L. <jas...@nt...> - 2009-11-18 22:15:41
|
I'm getting an invalid security certificate with that link julian. Jason On Wed, 2009-11-18 at 21:36 +0100, Julian Bäume wrote: > On Wednesday 18 November 2009 20:45:54 P Zoltan wrote: > > Good, so this question is cleared. > > Should I enable the git now? > I'm in. The sf.net wiki says, default repo-name will be like the project's > unix groupname. I guess, ktechlab that is. We should use this one as upstream, > since every user might at first try the standard configuration. > > As I told you, I already synced my repository against SVN. I think this is > ready to go upstream as it is. (Since I never changed a thing to any of these > branches). Have a look here: > https://krtek.asta.uni-luebeck.de/repos/KTechLab/ > There you can see 3 branches. Master is the branch representing SVN trunk and > ktechlab-0.3.7 obviously represents SVN branches/ktechlab-0.3.7. Since there > is no real 0.3.6 branch in SVN, I didn't copy more. There are 2 special > branches, that have not been in use for 2 years and the other one 20month, I > know that at least one of them isn't needed any longer ;) I also tagged the > 0.3.6 release commit, but haven't done so for 0.3.7. > > I think, the kde4-playground branch should not be upstream (I commited some > crap for testing purposes). I'll come up with a better one, based on master, > to provide a starting point for porting. > > bye then > julian > ------------------------------------------------------------------------------ > Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day > trial. Simplify your report design, integration and deployment - and focus on > what you do best, core application coding. Discover what's new with > Crystal Reports now. http://p.sf.net/sfu/bobj-july > _______________________________________________ Ktechlab-devel mailing list Kte...@li... https://lists.sourceforge.net/lists/listinfo/ktechlab-devel |
From: Julian B. <ju...@sv...> - 2009-11-19 06:30:52
|
hey, On Wednesday 18 November 2009 23:12:04 Jason Lucas wrote: > I'm getting an invalid security certificate with that link julian. That's strange. Since 2 years or so, the CA of my university uses a certificate signed by DFN-PCA which is itself signed by German Telekom. The last one should be shipped with any browser around and therefor the certificate chain should be valid :-S I always use https, because the firewall blocks port 80. But we have a web- server running on port 8080, so you could try without https here: http://krtek.asta.uni-luebeck.de:8080/repos/KTechLab/ bye julian |
From: Jason L. <jas...@nt...> - 2009-11-18 22:48:29
|
Git is now enabled on sf. Jason On Wed, 2009-11-18 at 20:45 +0100, P Zoltan wrote: > On Wed, 18 Nov 2009 19:18:21 +0100, Julian Bäume <ju...@sv...> wrote: > > > On Wednesday 18 November 2009 18:56:15 Julian Bäume wrote: > >> > Also I couldn't find any documentation about the usage of multiple > >> source > >> > code management systems for sourceforge. > >> Mhh, why should sf.net bother about this? If I had implemented it, there > >> would be an option: add SCM and remove SCM. Just like you add or remove > >> hosted-apps. I don't want the SVN repository to be deleted, so we maybe > >> should ask some sf.net staff, if it's possible and how to proceed. > > okay, I just visited the sf.net help channel in IRC and somebody of their > > support-staff told me, that it is possible to have "as many SCMs as you > > want > > enabled at the same time". > > Good, so this question is cleared. > Should I enable the git now? > > > > > bye > > julian > > > > ------------------------------------------------------------------------------ > Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day > trial. Simplify your report design, integration and deployment - and focus on > what you do best, core application coding. Discover what's new with > Crystal Reports now. http://p.sf.net/sfu/bobj-july > _______________________________________________ > Ktechlab-devel mailing list > Kte...@li... > https://lists.sourceforge.net/lists/listinfo/ktechlab-devel |
From: Julian B. <ju...@sv...> - 2009-11-19 07:02:27
|
On Wednesday 18 November 2009 23:44:50 Jason Lucas wrote: > Git is now enabled on sf. Well, I uploaded the SVN branches, for now. You can find them in the "git browse" section or you could just clone the repository. To do so, just run: git clone <url>. Developers with write access should use the read/write url from http://sourceforge.net/scm/?type=git&group_id=143459 and everybody else uses the read-only url. After that, you can start working. I'm going to add some hints, how to use git on the command line, to the wiki, which should make your lives more easy ;) Remember: you don't write anything to the remote repository until you do a "git push". This means, you can commit anything you want to your local repository and change that, as you like, until you push everything. After pushing it's still possible to "rewrite history", but this should be used in an emergency only. It desynchronises all other repositories, so they have to sync manually after that. It works, I tried it, but it's not fun ;) bye julian |
From: Julian B. <ju...@sv...> - 2009-11-19 07:59:44
|
On Thursday 19 November 2009 07:59:30 Julian Bäume wrote: > After that, you can start working. I'm going to add some hints, how to use > git on the command line, to the wiki, which should make your lives more > easy ;) Done. http://sourceforge.net/apps/mediawiki/ktechlab/index.php?title=Getting_the_source#Hints_for_git_users bye julian PS: damn long urls... ;) |
From: P Z. <zol...@gm...> - 2009-11-19 22:00:31
|
On Thu, 19 Nov 2009 07:59:30 +0100, Julian Bäume <ju...@sv...> wrote: > On Wednesday 18 November 2009 23:44:50 Jason Lucas wrote: >> Git is now enabled on sf. > Well, I uploaded the SVN branches, for now. You can find them in the "git > browse" section or you could just clone the repository. > > To do so, just run: git clone <url>. Developers with write access should > use > the read/write url from > http://sourceforge.net/scm/?type=git&group_id=143459 > and everybody else uses the read-only url. > So what is the situation with the separate developer repository? I want to test things while setting up the toolchain. |
From: Julian B. <ju...@sv...> - 2009-11-20 00:23:53
|
On Thursday 19 November 2009 23:56:46 P Zoltan wrote: > On Thu, 19 Nov 2009 07:59:30 +0100, Julian Bäume <ju...@sv...> wrote: > > On Wednesday 18 November 2009 23:44:50 Jason Lucas wrote: > >> Git is now enabled on sf. > > > > Well, I uploaded the SVN branches, for now. You can find them in the "git > > browse" section or you could just clone the repository. > > > > To do so, just run: git clone <url>. Developers with write access should > > use > > the read/write url from > > http://sourceforge.net/scm/?type=git&group_id=143459 > > and everybody else uses the read-only url. > > So what is the situation with the separate developer repository? I want > to test things while setting up the toolchain. For now, there is only one repository activated. See this link, how to create more: https://sourceforge.net/apps/trac/sourceforge/wiki/Git#CreatingMultipleRepositories If you create a repository called julian or jb-good (sf.net username), and grant write access to me, I can push something in there tomorrow. You can also create some more repos for Alan and you, so you can play around with git a little bit. bye then julian |
From: P Z. <zol...@gm...> - 2009-11-20 08:44:25
|
On Fri, 20 Nov 2009 01:13:40 +0100, Julian Bäume <ju...@sv...> wrote: > On Thursday 19 November 2009 23:56:46 P Zoltan wrote: >> On Thu, 19 Nov 2009 07:59:30 +0100, Julian Bäume <ju...@sv...> >> wrote: >> > On Wednesday 18 November 2009 23:44:50 Jason Lucas wrote: >> >> Git is now enabled on sf. >> > >> > Well, I uploaded the SVN branches, for now. You can find them in the >> "git >> > browse" section or you could just clone the repository. >> > >> > To do so, just run: git clone <url>. Developers with write access >> should >> > use >> > the read/write url from >> > http://sourceforge.net/scm/?type=git&group_id=143459 >> > and everybody else uses the read-only url. >> >> So what is the situation with the separate developer repository? I >> want >> to test things while setting up the toolchain. > For now, there is only one repository activated. See this link, how to > create > more: > https://sourceforge.net/apps/trac/sourceforge/wiki/Git#CreatingMultipleRepositories > > If you create a repository called julian or jb-good (sf.net username), > and > grant write access to me, I can push something in there tomorrow. You > can also > create some more repos for Alan and you, so you can play around with git > a > little bit. > There is written that you need shell access to create new repositories. So I'd like to ask Jason to create those, because I don't have shell access. > bye then > julian |
From: Julian B. <ju...@sv...> - 2009-11-20 09:11:09
|
On Friday 20 November 2009 10:46:59 P Zoltan wrote: > There is written that you need shell access to create new repositories. > So I'd like to ask Jason to create those, because I don't have shell > access. You can grant shell access to any project developer. You can activate a 4h shell session on the project page via Admin -> Members interface. It's more easy, if you uploaded an ssh-public-key to you sf.net account (see sourceforge.net/account/services, but you should have uploaded one for svn access, anyway ;)). Since I will be around for the next hours, I'd be glad to create the repositories. Just mail me, if I got access. Note, that your login-name must be constructed of your sf.net user-name and ktechlab (project unix-group) separated by a colon. (in my case this is "jb-good,ktechlab"). bye julian |
From: P Z. <zol...@gm...> - 2009-11-20 09:19:48
|
On Fri, 20 Nov 2009 10:08:10 +0100, Julian Bäume <ju...@sv...> wrote: > On Friday 20 November 2009 10:46:59 P Zoltan wrote: >> There is written that you need shell access to create new >> repositories. >> So I'd like to ask Jason to create those, because I don't have shell >> access. > You can grant shell access to any project developer. You can activate a > 4h > shell session on the project page via Admin -> Members interface. > > It's more easy, if you uploaded an ssh-public-key to you sf.net account > (see > sourceforge.net/account/services, but you should have uploaded one for > svn > access, anyway ;)). > > Since I will be around for the next hours, I'd be glad to create the > repositories. Just mail me, if I got access. Note, that your login-name > must > be constructed of your sf.net user-name and ktechlab (project unix-group) > separated by a colon. (in my case this is "jb-good,ktechlab"). > > bye > julian You were right, I could change it. Now you have shell access. About ssh-public-key: I don't have one (yet?); for SVN I've just set up the user/password for SVN, in kdevelop. |
From: Julian B. <ju...@sv...> - 2009-11-20 09:39:02
|
On Friday 20 November 2009 11:22:23 P Zoltan wrote: > On Fri, 20 Nov 2009 10:08:10 +0100, Julian Bäume <ju...@sv...> wrote: > > On Friday 20 November 2009 10:46:59 P Zoltan wrote: > >> There is written that you need shell access to create new > >> repositories. > >> So I'd like to ask Jason to create those, because I don't have shell > >> access. > > > > You can grant shell access to any project developer. You can activate a > > 4h > > shell session on the project page via Admin -> Members interface. > > > > It's more easy, if you uploaded an ssh-public-key to you sf.net account > > (see > > sourceforge.net/account/services, but you should have uploaded one for > > svn > > access, anyway ;)). > > > > Since I will be around for the next hours, I'd be glad to create the > > repositories. Just mail me, if I got access. Note, that your login-name > > must > > be constructed of your sf.net user-name and ktechlab (project unix-group) > > separated by a colon. (in my case this is "jb-good,ktechlab"). > > > You were right, I could change it. Now you have shell access. > > About ssh-public-key: I don't have one (yet?); for SVN I've just set up > the user/password for SVN, in kdevelop. It should, of course, also work with your sf.net account password. I'm just to lazy to use my pw all the time ;) In case you want to use it, there is a nice wiki page in sf.net wiki: http://sourceforge.net/apps/trac/sourceforge/wiki/SSH keys |
From: Julian B. <ju...@sv...> - 2009-11-20 10:30:49
|
On Friday 20 November 2009 11:22:23 P Zoltan wrote: > You were right, I could change it. Now you have shell access. Okay, finished. I hope I didn't miss anything and the names are okay, the way I choose them. FYI: everybody (in the ktechlab group) has got write access to all repositories, so we should agree, that we only push into our own repositories and upstream. Now, how to manage your multiple repositories on your computer? I suggest the following: I started checking out the upstream repository. This one is called origin, by default. I renamed that to upstream by doing: git remote rename origin upstream this way, I won't accidentally push something in there (since one would always have to explicitly mention the word "upstream"). After that, I added my repo as origin: git remote add origin ssh://jb- go...@kt.../gitroot/ktechlab/ktl-j_ohny_b and the other 2 developer repos as zoltan and alan (just the name and the last part of the path changes) You can update remote repos by doing: git fetch <name> after that the local list of branches will be up to date. You can list all branches: git branch -a bye julian PS: any further questions, requests (are the names, i did choose, okay?), contact me (I got only 1.5h shell-time left ;D) PPS: I'll push a working kde4 setup as a starting point later, today |