Re: [Kicad-developers] bzr is unmaintained. Should we move KiCAD repository to git too?
On Fri, Jan 3, 2014 at 12:01 AM, Ouabache Designworks z3qmt...@gmail.com wrote: My experience has been that any code worth writing will long outlive whatever rcs system that you are using. Expect to have to do this on a regular basis John Eaton On Thu, Jan 2, 2014 at 4:08 AM, Kaspar Emanuel kaspar.eman...@gmail.com wrote: This discussion springing up on emacs-devel is likely relevant: https://lists.gnu.org/archive/html/emacs-devel/2014-01/msg5.html On 2 December 2013 04:51, Povilas Kanapickas povi...@radix.lt wrote: Just for the record, git has submodules feature, which allows to store external dependencies in-tree and easily manage local patches to them. Regards, Povilas I've mentioned this on another thread but I'd like to re-iterate that I've tried to contribute to kicad but found bzr workflows to be very difficult to wrap my head around. I'm very familiar with cvs/svn/git though so I'd welcome a switch to git. Because git is so widely used now it may also make it easier for others to contribute. Chris ___ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
Re: [Kicad-developers] bzr is unmaintained. Should we move KiCAD repository to git too?
On Fri, Jan 3, 2014 at 9:02 AM, Brian Sidebotham brian.sidebot...@gmail.com wrote: Sorry, I've been off-list for a while whilst building my house over Christmas. bzr works fine and is what Launchpad hosted projects work with most easily. I don't see anyone wanting to change, especially as there's no real reason to change; Besides, bzr usage is included in the build system now too, so the commitment to bzr from KiCad appears clear. Tim/Chris, it's best to tell us what you're struggling with. All you have to actually do to contribute is: bzr branch lp:kicad *make changes* bzr diff new_feature.patch and email the patch to the developers list for review. Make sure you read the coding policies too. There's not much to bzr workflow, it's very typical distributed workflow. Best Regards, Brian. I'm not actively making changes but in case it helps someone else, here is what was confusing me. This is something I do a few times a day with git in order to keep history clean and integrate patch review feedback. How to get upstream changes while making local changes (or if I had a few local commits)? The other thing I couldn't figure out was how to modify local changes, and how to modify changes that were one or more changes behind my latest change. So if I wanted to build up a patch series how do I clean that up based on feedback or things I've learned along the way? ... - commit X (upstream HEAD) - commit 1 (local change) - commit 2 (local change / local HEAD) How to modify commit 1? It might help to document how to map these operations from git to bzr on the kicad page to help get people familiar with git up-to-speed. Chris ___ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
Re: [Kicad-developers] bzr is unmaintained. Should we move KiCAD repository to git too?
On 3 January 2014 14:09, Chris Morgan chmor...@gmail.com wrote: I'm not actively making changes but in case it helps someone else, here is what was confusing me. This is something I do a few times a day with git in order to keep history clean and integrate patch review feedback. How to get upstream changes while making local changes (or if I had a few local commits)? Just merge the current tip: bzr merge lp:kicad The other thing I couldn't figure out was how to modify local changes, and how to modify changes that were one or more changes behind my latest change. So if I wanted to build up a patch series how do I clean that up based on feedback or things I've learned along the way? ... - commit X (upstream HEAD) - commit 1 (local change) - commit 2 (local change / local HEAD) How to modify commit 1? Changing your workflow here will probably help if you want to work on different features at the same time, rather than trying to shoehorn that into one feature per commit, which I guess is what you're trying to achieve. Just branch locally as it's cheap: bzr branch ./kicad ./kicad-newfeature-1 bzr branch ./kicad ./kicad-newfeature-2 etc. Then commit locally as many times as you like in each feature. If you're doing parallel development and need both changes simultaneously, you could branch again and merge both features in, etc. Don't use bzr like git or svn or rcs or anything else, it's bzr and git's git! They do not have direct translation to one another. It might help to document how to map these operations from git to bzr on the kicad page to help get people familiar with git up-to-speed. Contributing to KiCad is extremely easy given you only have to branch, make changes and then create a patch and email it to the list. Please feel free to use this easy method to contribute your first changes. Best Regards, Brian. ___ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
Re: [Kicad-developers] bzr is unmaintained. Should we move KiCAD repository to git too?
This discussion springing up on emacs-devel is likely relevant: https://lists.gnu.org/archive/html/emacs-devel/2014-01/msg5.html On 2 December 2013 04:51, Povilas Kanapickas povi...@radix.lt wrote: Just for the record, git has submodules feature, which allows to store external dependencies in-tree and easily manage local patches to them. Regards, Povilas ___ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
Re: [Kicad-developers] bzr is unmaintained. Should we move KiCAD repository to git too?
On Thu, Jan 02, 2014 at 01:08:54PM +0100, Kaspar Emanuel wrote: This discussion springing up on emacs-devel is likely relevant: https://lists.gnu.org/archive/html/emacs-devel/2014-01/msg5.html The linked article is actually very interesting (bzr being decommissioned or not)... I partially agree with it but as always it depends on workflow and use cases (in my experience for non-open source usually a centralized system like SVN works better, expecially with idiot programmers:D); that bzr is slow (acceptably slow, anyway) is undeniable but, for example, strict immutability could be an asset (ask people writing safety system, certification entities often mandates such kind of auditing measures). A core developer gone missing also *is* a big issue... OTOH it also says that it is a stable/reliable system, anyway. Still they haven't fixed the proxy access issues... Personally I'm neutral on the bzr vs git issue (slightly like git better), but, for example, the 'commit ids' are not sequential and I don't like that... (also the --amend could be interpreted as an 'history changer'). In short it's a pro/cons valutation. For inertia I'd keep bzr to avoid changing stuff that works:P -- Lorenzo Marcantonio Logos Srl ___ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
Re: [Kicad-developers] bzr is unmaintained. Should we move KiCAD repository to git too?
My experience has been that any code worth writing will long outlive whatever rcs system that you are using. Expect to have to do this on a regular basis John Eaton On Thu, Jan 2, 2014 at 4:08 AM, Kaspar Emanuel kaspar.eman...@gmail.comwrote: This discussion springing up on emacs-devel is likely relevant: https://lists.gnu.org/archive/html/emacs-devel/2014-01/msg5.html On 2 December 2013 04:51, Povilas Kanapickas povi...@radix.lt wrote: Just for the record, git has submodules feature, which allows to store external dependencies in-tree and easily manage local patches to them. Regards, Povilas ___ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
Re: [Kicad-developers] bzr is unmaintained. Should we move KiCAD repository to git too?
Just for the record, git has submodules feature, which allows to store external dependencies in-tree and easily manage local patches to them. Regards, Povilas ___ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
Re: [Kicad-developers] bzr is unmaintained. Should we move KiCAD repository to git too?
On 11/27/2013 10:09 PM, Povilas Kanapickas wrote: ... is quite mature and there are no bugs interfere with KiCAD development. ... Sorry for the typos: Should be ... is quite mature and there are no bugs that interfere with KiCAD development. Regards, Povilas ___ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
Re: [Kicad-developers] bzr is unmaintained. Should we move KiCAD repository to git too?
On Wed, Nov 27, 2013 at 10:14:10PM +0200, Povilas Kanapickas wrote: On 11/27/2013 10:09 PM, Povilas Kanapickas wrote: ... is quite mature and there are no bugs interfere with KiCAD development. ... Sorry for the typos: Should be ... is quite mature and there are no bugs that interfere with KiCAD development. The fact that bzr has so few commits would be in fact a sign that's working fine IMHO :D Please no VCS holy wars, but I don't feel the need for changing system if the current one works... Also what about the pain of a) converting the repo and b) converting all the private repos out there? if it where, like, svn just migrate (if possible without losing a thing) and you are fine. DVCS instead need a way bigger involvement to migrate! -- Lorenzo Marcantonio Logos Srl ___ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
Re: [Kicad-developers] bzr is unmaintained. Should we move KiCAD repository to git too?
On 11/27/2013 10:47 PM, Lorenzo Marcantonio wrote: On Wed, Nov 27, 2013 at 10:14:10PM +0200, Povilas Kanapickas wrote: The fact that bzr has so few commits would be in fact a sign that's working fine IMHO :D I believe this is not the case. See [1] and e.g. this post [2]. Please no VCS holy wars, but I don't feel the need for changing system if the current one works... I share your view. I just think that there's high chance that migration away from bzr will happen in the future anyway, thus the proposal. I will unconditionally accept any strong objections. Also what about the pain of a) converting the repo and b) converting all the private repos out there? if it where, like, svn just migrate (if possible without losing a thing) and you are fine. DVCS instead need a way bigger involvement to migrate! Bzr to git migration is very easy. The commands are very similar to the following script: # we are in ../kicad.bzr mkdir ../tmp.git cd ../tmp.git git init --bare bzr fast-export ../kicad.bzr branch | git fast-import mkdir ../kicad.git git clone ../tmp.git # current dir has a git-to-bzr clone The above may contain some errors or typos as I don't have the exact script that I used to convert several other fairly large projects at hand. Thus I believe even private repo migration shouldn't involve more than several minutes of developers time. Regards, Povilas [1]: https://bugs.launchpad.net/bzr/+bugs [2]: https://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00781.html ___ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
Re: [Kicad-developers] bzr is unmaintained. Should we move KiCAD repository to git too?
On 11/27/2013 04:10 PM, Povilas Kanapickas wrote: On 11/27/2013 10:47 PM, Lorenzo Marcantonio wrote: On Wed, Nov 27, 2013 at 10:14:10PM +0200, Povilas Kanapickas wrote: The fact that bzr has so few commits would be in fact a sign that's working fine IMHO :D I believe this is not the case. See [1] and e.g. this post [2]. Please no VCS holy wars, but I don't feel the need for changing system if the current one works... I share your view. I just think that there's high chance that migration away from bzr will happen in the future anyway, thus the proposal. I will unconditionally accept any strong objections. I have a strong objection. I have no interest in moving the KiCad project to another VCS and/or hosting site. It has nothing to do with GIT but it hasn't been all that long since we moved from Subversion and SourceForge. That transition was not without issues. What does moving buy us that we don't already have? Is Bazaar not meeting our VCS needs or Lauchpad not meeting our hosting needs? Not as far as I can tell. If tomorrow Canonical says they are shutting Launchpad down, that would be different. Also what about the pain of a) converting the repo and b) converting all the private repos out there? if it where, like, svn just migrate (if possible without losing a thing) and you are fine. DVCS instead need a way bigger involvement to migrate! Bzr to git migration is very easy. The commands are very similar to the following script: # we are in ../kicad.bzr mkdir ../tmp.git cd ../tmp.git git init --bare bzr fast-export ../kicad.bzr branch | git fast-import mkdir ../kicad.git git clone ../tmp.git # current dir has a git-to-bzr clone It's not just the repo that would require conversion. The bug list, questions, FAQ, and blueprints would either have be abandoned or migrated to another host such as GitHub unless Launchpad supports GIT. The above may contain some errors or typos as I don't have the exact script that I used to convert several other fairly large projects at hand. Thus I believe even private repo migration shouldn't involve more than several minutes of developers time. Regards, Povilas [1]: https://bugs.launchpad.net/bzr/+bugs [2]: https://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00781.html ___ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
Re: [Kicad-developers] bzr is unmaintained. Should we move KiCAD repository to git too?
On 11/27/2013 11:47 PM, Wayne Stambaugh wrote: I have a strong objection. That makes things clear. Sorry for the spent time. It's not just the repo that would require conversion. The bug list, questions, FAQ, and blueprints would either have be abandoned or migrated to another host such as GitHub unless Launchpad supports GIT. Some projects, such as e.g. QEMU[1], use Github for the main repo and Launchpad for the bug tracker and everything else. Regards, Povilas [1]: https://github.com/qemu/QEMU ___ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
