Re: [Geany-devel] Geany-Plugins: MAINTAINERS file
On Fri, 06 Jan 2012 18:15:32 +0100 Colomban Wendling wrote: > Le 06/01/2012 10:29, Frank Lanitz a écrit : > > Hi folks, > > > > We have just added a MAINTAINERS into git to add a single point to > > find who is responsible for a plugin. Please be so kind and sending > > in patches or updating the file on your own for your plugins to > > show who is maintaining etc. File contains a little header with > > very brief instructions to do so. > > Oops sorry, I completely forgot to do it myself. Now done. > > Just a few questions: > > * What's the exact difference between P and M? Do we really expect to > have a maintainer but somebody else that deals with the patches? Well... maybe the maintainer likes to get the patches sent to a team or a mailing list. > * What's the exact difference between Supported and Maintained? The > only difference I see is that "supported" has the word "paid" in the > description, but I doubt that most of us get paid for this in > particular, and I also doubt it changes anything on how good is the > support (hobby vs. job). My fault. I wanted to change this but missed it. I wanted to s/supported/paid for ... (Even I don't know anybody at the moment who is getting paid with Geany stuff ;) ) Cheers, Frank -- http://frank.uvena.de/en/ pgph7zgiPH5OE.pgp Description: PGP signature ___ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
Re: [Geany-devel] Geany-Plugins: MAINTAINERS file
On Fri, 2012-01-06 at 19:52 +0200, Dimitar Zhekov wrote: > On Fri, 06 Jan 2012 10:29:30 +0100 > Frank Lanitz wrote: > > > We have just added a MAINTAINERS into git to add a single point to find > > who is responsible for a plugin. Please be so kind and sending in > > patches or updating the file on your own [...] > > Here's a patch. Applied, thanks. :) -- Dominic Hopf http://dominichopf.de/ Key Fingerprint: A7DF C4FC 07AE 4DDC 5CA0 BD93 AAB0 6019 CA7D 868D signature.asc Description: This is a digitally signed message part ___ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
Re: [Geany-devel] Geany-Plugins: MAINTAINERS file
On Fri, 06 Jan 2012 10:29:30 +0100 Frank Lanitz wrote: > We have just added a MAINTAINERS into git to add a single point to find > who is responsible for a plugin. Please be so kind and sending in > patches or updating the file on your own [...] Here's a patch. -- E-gards: Jimmy >From 210845809a50b43a1c052ace25cdb365b4f923a4 Mon Sep 17 00:00:00 2001 From: Dimitar Zhekov Date: Fri, 6 Jan 2012 19:48:03 +0200 Subject: [PATCH] Added myself as maintainer of geanyextrasel and geanyinsertnum --- MAINTAINERS | 16 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index b271549..6219dd7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -43,10 +43,10 @@ W: S: geanyextrasel -P: -M: -W: -S: +P: Dimitar Zhekov +M: Dimitar Zhekov +W: http://sheckley.users.sourceforge.net +S: Supported geanygdb P: Dominic Hopf @@ -61,10 +61,10 @@ W: http://plugins.geany.org/geanygendoc.html S: Supported geanyinsertnum -P: -M: -W: -S: +P: Dimitar Zhekov +M: Dimitar Zhekov +W: http://sheckley.users.sourceforge.net +S: Supported geanylatex P: Frank Lanitz -- 1.7.7.3 ___ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
Re: [Geany-devel] GtkFileChooser "recent" annoyance
Le 20/12/2011 19:18, Colomban Wendling a écrit : > Le 20/12/2011 05:07, Matthew Brush a écrit : >> Hi, >> >> Is anyone opposed to me committing the trivial patch attached here. The >> comment I think describes it well enough, and if you're using recent >> GTK+ 2.24.x you probably already know about it. >> >> I didn't want to commit without asking since maybe some people will find >> this new "feature"[1][2] useful, I personally find it extremely >> annoying, but I wouldn't want to fix it at the expense of annoying others. > > While I agree the recent list is not useful most of the time (probably > even annoying since I don't know that dir) for me either, I doubt $HOME > is really best. > > I see 2 alternative, and I think better, choices: > > 1) use the basedir of the currently opened file; > 2) use the "current dir" (e.g. dir from where Geany was started) [1]. >AFAIK this will be $HOME for panel/shell-launched apps. > > And maybe add an hidden option in case ppl actually like the GTK feature? Hum, actually we already have a setting allowing the user to choose the directory to show by default in the open dialog (general -> startup -> startup folder), so annoyed user can easily change the default. OTOH, while I personally don't like the feature very much and still thinks such a change shouldn't have happened in GTK2 as it did, I don't find really comfortable working this around. IMHO, if this really annoys people, the GTK guys should either revert the patch or add a GtkSetting for whether to use it or not. It'd fix the thing for all apps, and wouldn't require ugly workarounds. So I'd finally vote against applying the patch, since we do actually have a quite easy way to work it around that's IMO better than the patch. Regards, Colomban > Cheers, > Colomban > > > [1] maybe not on Windows where I think the "current dir" is always the > binary location? > >> >> Cheers, >> Matthew Brush >> >> [1] >> https://live.gnome.org/DocumentCentricGnome/Help%20the%20user%20choose%20a%20place%20to%20put%20a%20new%20file >> >> [2] I think we can safely assume Geany users (ie. programmers) already >> know how to manage files :) ___ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
Re: [Geany-devel] Geany-Plugins: MAINTAINERS file
Le 06/01/2012 10:29, Frank Lanitz a écrit : > Hi folks, > > We have just added a MAINTAINERS into git to add a single point to find > who is responsible for a plugin. Please be so kind and sending in > patches or updating the file on your own for your plugins to show who is > maintaining etc. File contains a little header with very brief > instructions to do so. Oops sorry, I completely forgot to do it myself. Now done. Just a few questions: * What's the exact difference between P and M? Do we really expect to have a maintainer but somebody else that deals with the patches? * What's the exact difference between Supported and Maintained? The only difference I see is that "supported" has the word "paid" in the description, but I doubt that most of us get paid for this in particular, and I also doubt it changes anything on how good is the support (hobby vs. job). Cheers, Colomban ___ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
Re: [Geany-devel] Q: how to switch to new Git repo?
It seems that everything went fine. My personal fork is https://github.com/earshinov/geany/, and the new home for sm branch is https://github.com/earshinov/geany/tree/sm. Jiří, I suppose you can safely remove your sm-branch repository. Thank you for keeping it for so long! -- Best regards, Eugene. ___ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
Re: [Geany-devel] Q: how to switch to new Git repo?
On Fri, 06 Jan 2012 16:55:06 +0100 Thomas Martitz wrote: > Am 06.01.2012 16:52, schrieb Eugene Arshinov: > > Hi Thomas, > > > > Thanks for the reply. If I can't preserve merges anyway, I'm going > > to transfer the sm branch right from my existing local Git > > repository. That is, > > > > 1. I will fork the main repository and clone it > > 2. add existing local repository as a remote > > 3. rebase the sm branch from the remote onto the corresponding > > commit cloned from the fork. > > > > I guess, this should work. > > > > I dont think you can add the local repository as a remote (I am > assuming that local repo is a git-svn repo from before the > conversion) as the history is different. The history needs to be the > same so git can reasonable tell which commits need to be rebased. > I'll try. I'm going to use `git rebase --onto ...` which (iiuc) does not require common history between the rebased commits. And, local repository as a remote should work well: some time ago I even managed to use a local repository as a Git submodule (for experiment only :) > Are you saying that the sm branch in [1] is out of date and you would > rather use what you have locally? > The sm branch in [1] is correct. I just don't want to clone it, as I already have the same state locally, to save bandwidth (which currently costs me some $). > Best regards > > [1]: https://github.com/techee/sm-branch/ > ___ > Geany-devel mailing list > Geany-devel@uvena.de > https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel ___ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
Re: [Geany-devel] Q: how to switch to new Git repo?
Am 06.01.2012 16:52, schrieb Eugene Arshinov: Hi Thomas, Thanks for the reply. If I can't preserve merges anyway, I'm going to transfer the sm branch right from my existing local Git repository. That is, 1. I will fork the main repository and clone it 2. add existing local repository as a remote 3. rebase the sm branch from the remote onto the corresponding commit cloned from the fork. I guess, this should work. I dont think you can add the local repository as a remote (I am assuming that local repo is a git-svn repo from before the conversion) as the history is different. The history needs to be the same so git can reasonable tell which commits need to be rebased. Are you saying that the sm branch in [1] is out of date and you would rather use what you have locally? Best regards [1]: https://github.com/techee/sm-branch/ ___ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
Re: [Geany-devel] Q: how to switch to new Git repo?
Hi Thomas, Thanks for the reply. If I can't preserve merges anyway, I'm going to transfer the sm branch right from my existing local Git repository. That is, 1. I will fork the main repository and clone it 2. add existing local repository as a remote 3. rebase the sm branch from the remote onto the corresponding commit cloned from the fork. I guess, this should work. -- Best regards, Eugene. On Fri, 06 Jan 2012 16:37:05 +0100 Thomas Martitz wrote: > Am 06.01.2012 16:32, schrieb Eugene Arshinov: > > Hi guys! > > > > It's me again, after a long time. Please help me organize my Geany > > repository. The last time I worked on Geany it was in SVN > > repository, and I was using it through git-svn. Now there are two > > Git repositories: the main one [1] and the one containing my > > sm-branch [2]. I assume I should make the fork of the former and > > put my sm branch there, but how do I transfer my sm branch, > > preserving merge commits (master -> sm)? > > > > [1]: https://github.com/geany/geany > > [2]: https://github.com/techee/sm-branch/ > > > > > > > I don't think you can preserve merge commits. The history of the new > git and the old git-svn repos are incomatible (e.g. the new history > has proper author information) so they're meaningless anyway. > > I suggest you rebase in the old repo and use patches to apply the > changes to the new repo on the same revision/commit. Using 'git > format-patch' and 'git am' you can preserve your non-merge commit > history. Or just do 'git diff' for a single big patch, > > Best regards. > ___ > Geany-devel mailing list > Geany-devel@uvena.de > https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel ___ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
Re: [Geany-devel] Q: how to switch to new Git repo?
Am 06.01.2012 16:32, schrieb Eugene Arshinov: Hi guys! It's me again, after a long time. Please help me organize my Geany repository. The last time I worked on Geany it was in SVN repository, and I was using it through git-svn. Now there are two Git repositories: the main one [1] and the one containing my sm-branch [2]. I assume I should make the fork of the former and put my sm branch there, but how do I transfer my sm branch, preserving merge commits (master -> sm)? [1]: https://github.com/geany/geany [2]: https://github.com/techee/sm-branch/ I don't think you can preserve merge commits. The history of the new git and the old git-svn repos are incomatible (e.g. the new history has proper author information) so they're meaningless anyway. I suggest you rebase in the old repo and use patches to apply the changes to the new repo on the same revision/commit. Using 'git format-patch' and 'git am' you can preserve your non-merge commit history. Or just do 'git diff' for a single big patch, Best regards. ___ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
[Geany-devel] Q: how to switch to new Git repo?
Hi guys! It's me again, after a long time. Please help me organize my Geany repository. The last time I worked on Geany it was in SVN repository, and I was using it through git-svn. Now there are two Git repositories: the main one [1] and the one containing my sm-branch [2]. I assume I should make the fork of the former and put my sm branch there, but how do I transfer my sm branch, preserving merge commits (master -> sm)? [1]: https://github.com/geany/geany [2]: https://github.com/techee/sm-branch/ -- Best regards, Eugene. ___ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
[Geany-devel] Geany-Plugins: MAINTAINERS file
Hi folks, We have just added a MAINTAINERS into git to add a single point to find who is responsible for a plugin. Please be so kind and sending in patches or updating the file on your own for your plugins to show who is maintaining etc. File contains a little header with very brief instructions to do so. Cheers, Frank ___ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
