Re: Git commit in all available branches
13.10.2010 03:07, Jesse Keating пишет: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 10/8/10 7:03 AM, Pavel Alexeev (aka Pahan-Hubbitus) wrote: In most cases I try sync all branches if there no real reasons to make differences. After made some changes in origin/master and commit is I also must do for each available branches something similar: fedpkg switch-branch el5; git pull git merge origin/master git push fedpkg build fedpkg update Off course I can script it with shell, but may be there already possibility to commit in few branches? Something like this: fedpkg commit -F clog -B f12,f13,f14,el5,el6 And will be very cool to start build and push updates (by single template interactively filled one time) also for several branches. I believe there is already a filed RFE for this in fedpkg, and if not it is on my mind for future functionality. I want fill it, but bugzilla even do not contain such component as fedpkg. Why? I have filled it https://fedorahosted.org/fedora-packager/ticket/80 - -- Jesse Keating Fedora -- Freedom² is a feature! identi.ca: http://identi.ca/jkeating -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (Darwin) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAky06kcACgkQ4v2HLvE71NXfMACgx4uftMi8pnyYCJSzr7Lt0IJu N1gAnjDA1wn2/qqiSJSjMlNftJXr0kjK =t82w -END PGP SIGNATURE- -- devel mailing list devel@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/devel
Re: Git commit in all available branches
On Tue, 12 Oct 2010 13:08:17 +1000 Jeffrey Fearn jfe...@redhat.com wrote: ...snip... What sort of updates does it get? Large changes of every kind: bug fixes, new features, changes in behavior of existing features. Everything you'd expect of an application that is fairly young and has a demanding user base ... a very demanding user base ... OK, an extremely demanding user base ... yeah, I have ulcers. And these users expect these things in stable releases? Do you ever get bugs asking you to not change interfaces or that some update causes breakage? Do you land in rawhide first to get additional testing before sending on to stable? Do updates cause changes in things like command line parameters, etc? Do you know how many users you have? This seems like it might be a pretty specialized package and have a pretty small pool of users. kevin signature.asc Description: PGP signature -- devel mailing list devel@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/devel
Re: Git commit in all available branches
Unfortunately it is not what I initially ask :( 12.10.2010 19:14, matt_dom...@dell.com wrote: Correct, it's simply a git merge specifying the merge method, to ensure there are no merge conflicts - just make an exact copy of the origin/master branch onto the current branch. You must still 'fedpkg switch-branch' before invoking this. -- Matt Domsch Technology Strategist Dell | Office of the CTO -Original Message- From: Pavel Alexeev (aka Pahan-Hubbitus) [mailto:fo...@hubbitus.com.ru] Sent: Tuesday, October 12, 2010 3:07 AM To: Domsch, Matt Subject: Re: Git commit in all available branches 11.10.2010 05:28, Matt Domsch пишет: On Fri, Oct 08, 2010 at 06:03:04PM +0400, Pavel Alexeev (aka Pahan-Hubbitus) wrote: In most cases I try sync all branches if there no real reasons to make differences. After made some changes in origin/master and commit is I also must do for each available branches something similar: fedpkg switch-branch el5; git pull git merge origin/master git push fedpkg build fedpkg update I find this works to apply the version from 'master' into the current (say, el5) branch. $ git merge -s recursive -X theirs master Sorry, I think does not understand you. Where I can there provide on what branches I want do that?? On first glance it us mostly equivalent of present before git merge origin/master with additional strategy option only. I've read git-merge man, but still does not understand how it helps. Please describe slightly. There are valid reasons for doing this - e.g. a bug fix release of a package by the upstream, that doesn't break the ABI. Thanks, Matt -- devel mailing list devel@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/devel
Re: Git commit in all available branches
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 10/8/10 7:03 AM, Pavel Alexeev (aka Pahan-Hubbitus) wrote: In most cases I try sync all branches if there no real reasons to make differences. After made some changes in origin/master and commit is I also must do for each available branches something similar: fedpkg switch-branch el5; git pull git merge origin/master git push fedpkg build fedpkg update Off course I can script it with shell, but may be there already possibility to commit in few branches? Something like this: fedpkg commit -F clog -B f12,f13,f14,el5,el6 And will be very cool to start build and push updates (by single template interactively filled one time) also for several branches. I believe there is already a filed RFE for this in fedpkg, and if not it is on my mind for future functionality. - -- Jesse Keating Fedora -- Freedom² is a feature! identi.ca: http://identi.ca/jkeating -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (Darwin) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAky06kcACgkQ4v2HLvE71NXfMACgx4uftMi8pnyYCJSzr7Lt0IJu N1gAnjDA1wn2/qqiSJSjMlNftJXr0kjK =t82w -END PGP SIGNATURE- -- devel mailing list devel@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/devel
Re: Git commit in all available branches
On Tue, Oct 12, 2010 at 01:08:17PM +1000, Jeffrey Fearn wrote: Kevin Fenzi wrote: On Tue, 12 Oct 2010 09:32:15 +1000 Jeffrey Fearn jfe...@redhat.com wrote: What do you mean leave it alone? The people using it WANT the changes. Why are you telling them how they can use their system? Not at all. :) They want the changes, it's trivial for me to give them the changes, why wouldn't I give them the changes? Because it breaks things or changes behavior for another large group of users? As I said, if I was doing a systems level package I'd not do it, but at the application level you only tend to affect users of your application. Can we perhaps stop talking in the abstract? What package is this? publican\* What sort of updates does it get? Large changes of every kind: bug fixes, new features, changes in behavior of existing features. Everything you'd expect of an application that is fairly young and has a demanding user base ... a very demanding user base ... OK, an extremely demanding user base ... yeah, I have ulcers. the only non-demanding user base is the one of size 0. Cheers, Peter -- devel mailing list devel@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/devel
Re: Git commit in all available branches
On Mon, 11 Oct 2010 09:07:17 +1000 Jeff Fearn jfe...@redhat.com wrote: On Fri, 2010-10-08 at 13:56 -0600, Kevin Fenzi wrote: On Fri, 08 Oct 2010 18:03:04 +0400 Pavel Alexeev (aka Pahan-Hubbitus) fo...@hubbitus.com.ru wrote: In most cases I try sync all branches if there no real reasons to make differences. ...snip... I would hope a real reason would be that the update is not a security or bugfix only update, right? IMHO it depends on what kind of software it is. I push releases of applications to all current Fedora releases. The users want the new features, it's what they have been bugging me for. If I was working on glibc or X I might not do that, but applications should be pushed back unless there is some system level constraint preventing it. So I too would like a commit to all branches or sync all branches to this one command. If it doesn't change the user experience, and fixes bugs or security issues, then great. ;) If it's a major update which does change the user experience, breaks ABI/API, or adds a bunch of new functionality, then please don't. kevin signature.asc Description: PGP signature -- devel mailing list devel@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/devel
Re: Git commit in all available branches
Kevin Fenzi wrote: On Mon, 11 Oct 2010 09:07:17 +1000 Jeff Fearn jfe...@redhat.com wrote: On Fri, 2010-10-08 at 13:56 -0600, Kevin Fenzi wrote: On Fri, 08 Oct 2010 18:03:04 +0400 Pavel Alexeev (aka Pahan-Hubbitus) fo...@hubbitus.com.ru wrote: In most cases I try sync all branches if there no real reasons to make differences. ...snip... I would hope a real reason would be that the update is not a security or bugfix only update, right? IMHO it depends on what kind of software it is. I push releases of applications to all current Fedora releases. The users want the new features, it's what they have been bugging me for. If I was working on glibc or X I might not do that, but applications should be pushed back unless there is some system level constraint preventing it. So I too would like a commit to all branches or sync all branches to this one command. If it doesn't change the user experience, and fixes bugs or security issues, then great. ;) If it's a major update which does change the user experience, breaks ABI/API, or adds a bunch of new functionality, then please don't. If you want ABI stability buy RHEL or use CentOS, because clearly your requirements are completely different from the requirements of most of the users of my software. They'd go batty if I tried to tell them they had to use rawhide to get a new feature. Cheers, Jeff. -- Jeff Fearn jfe...@redhat.com Software Engineer Engineering Operations Red Hat, Inc Freedom ... courage ... Commitment ... ACCOUNTABILITY -- devel mailing list devel@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/devel
Re: Git commit in all available branches
On Tue, Oct 12, 2010 at 09:23:24AM +1000, Jeffrey Fearn wrote: Kevin Fenzi wrote: On Mon, 11 Oct 2010 09:07:17 +1000 Jeff Fearn jfe...@redhat.com wrote: On Fri, 2010-10-08 at 13:56 -0600, Kevin Fenzi wrote: On Fri, 08 Oct 2010 18:03:04 +0400 Pavel Alexeev (aka Pahan-Hubbitus) fo...@hubbitus.com.ru wrote: In most cases I try sync all branches if there no real reasons to make differences. ...snip... I would hope a real reason would be that the update is not a security or bugfix only update, right? IMHO it depends on what kind of software it is. I push releases of applications to all current Fedora releases. The users want the new features, it's what they have been bugging me for. If I was working on glibc or X I might not do that, but applications should be pushed back unless there is some system level constraint preventing it. So I too would like a commit to all branches or sync all branches to this one command. If it doesn't change the user experience, and fixes bugs or security issues, then great. ;) If it's a major update which does change the user experience, breaks ABI/API, or adds a bunch of new functionality, then please don't. If you want ABI stability buy RHEL or use CentOS, because clearly your requirements are completely different from the requirements of most of the users of my software. They'd go batty if I tried to tell them they had to use rawhide to get a new feature. Surely it would be ok to tell them use the latest Fedora so you can at least leave Fn-1 (currently F12) alone. -- devel mailing list devel@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/devel
Re: Git commit in all available branches
Chuck Anderson wrote: On Tue, Oct 12, 2010 at 09:23:24AM +1000, Jeffrey Fearn wrote: Kevin Fenzi wrote: On Mon, 11 Oct 2010 09:07:17 +1000 Jeff Fearn jfe...@redhat.com wrote: On Fri, 2010-10-08 at 13:56 -0600, Kevin Fenzi wrote: On Fri, 08 Oct 2010 18:03:04 +0400 Pavel Alexeev (aka Pahan-Hubbitus) fo...@hubbitus.com.ru wrote: In most cases I try sync all branches if there no real reasons to make differences. ...snip... I would hope a real reason would be that the update is not a security or bugfix only update, right? IMHO it depends on what kind of software it is. I push releases of applications to all current Fedora releases. The users want the new features, it's what they have been bugging me for. If I was working on glibc or X I might not do that, but applications should be pushed back unless there is some system level constraint preventing it. So I too would like a commit to all branches or sync all branches to this one command. If it doesn't change the user experience, and fixes bugs or security issues, then great. ;) If it's a major update which does change the user experience, breaks ABI/API, or adds a bunch of new functionality, then please don't. If you want ABI stability buy RHEL or use CentOS, because clearly your requirements are completely different from the requirements of most of the users of my software. They'd go batty if I tried to tell them they had to use rawhide to get a new feature. Surely it would be ok to tell them use the latest Fedora so you can at least leave Fn-1 (currently F12) alone. What do you mean leave it alone? The people using it WANT the changes. Why are you telling them how they can use their system? They want the changes, it's trivial for me to give them the changes, why wouldn't I give them the changes? Cheers, Jeff. -- Jeff Fearn jfe...@redhat.com Software Engineer Engineering Operations Red Hat, Inc Freedom ... courage ... Commitment ... ACCOUNTABILITY -- devel mailing list devel@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/devel
Re: Git commit in all available branches
On Tue, Oct 12, 2010 at 09:32:15AM +1000, Jeffrey Fearn wrote: What do you mean leave it alone? The people using it WANT the changes. Why are you telling them how they can use their system? Because by pushing updates you're also potentially making it impossible for people who don't want new bugs to use Fedora. The board have decided that that's a class of user that we want to support. They want the changes, it's trivial for me to give them the changes, why wouldn't I give them the changes? Because anyone who says that they can provide a software update without any risk of breaking something that a user currently depends on is either naive or lying. -- Matthew Garrett | mj...@srcf.ucam.org -- devel mailing list devel@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/devel
Re: Git commit in all available branches
Matthew Garrett wrote: On Tue, Oct 12, 2010 at 09:32:15AM +1000, Jeffrey Fearn wrote: What do you mean leave it alone? The people using it WANT the changes. Why are you telling them how they can use their system? Because by pushing updates you're also potentially making it impossible for people who don't want new bugs to use Fedora. The board have decided that that's a class of user that we want to support. They also won't get old bugs fixed because I for one don't have the time , or the will, to maintain multiple versions. They want the changes, it's trivial for me to give them the changes, why wouldn't I give them the changes? Because anyone who says that they can provide a software update without any risk of breaking something that a user currently depends on is either naive or lying. Guess we are lucky no one said such a stupid thing eh. Cheers, Jeff. -- Jeff Fearn jfe...@redhat.com Software Engineer Engineering Operations Red Hat, Inc Freedom ... courage ... Commitment ... ACCOUNTABILITY -- devel mailing list devel@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/devel
Re: Git commit in all available branches
On Tue, 12 Oct 2010 09:32:15 +1000 Jeffrey Fearn jfe...@redhat.com wrote: What do you mean leave it alone? The people using it WANT the changes. Why are you telling them how they can use their system? Not at all. :) They want the changes, it's trivial for me to give them the changes, why wouldn't I give them the changes? Because it breaks things or changes behavior for another large group of users? Can we perhaps stop talking in the abstract? What package is this? What sort of updates does it get? kevin signature.asc Description: PGP signature -- devel mailing list devel@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/devel
Re: Git commit in all available branches
Kevin Fenzi wrote: On Tue, 12 Oct 2010 09:32:15 +1000 Jeffrey Fearn jfe...@redhat.com wrote: What do you mean leave it alone? The people using it WANT the changes. Why are you telling them how they can use their system? Not at all. :) They want the changes, it's trivial for me to give them the changes, why wouldn't I give them the changes? Because it breaks things or changes behavior for another large group of users? As I said, if I was doing a systems level package I'd not do it, but at the application level you only tend to affect users of your application. Can we perhaps stop talking in the abstract? What package is this? publican\* What sort of updates does it get? Large changes of every kind: bug fixes, new features, changes in behavior of existing features. Everything you'd expect of an application that is fairly young and has a demanding user base ... a very demanding user base ... OK, an extremely demanding user base ... yeah, I have ulcers. Cheers, Jeff. -- Jeff Fearn jfe...@redhat.com Software Engineer Engineering Operations Red Hat, Inc Freedom ... courage ... Commitment ... ACCOUNTABILITY -- devel mailing list devel@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/devel
Re: Git commit in all available branches
On Fri, 2010-10-08 at 13:56 -0600, Kevin Fenzi wrote: On Fri, 08 Oct 2010 18:03:04 +0400 Pavel Alexeev (aka Pahan-Hubbitus) fo...@hubbitus.com.ru wrote: In most cases I try sync all branches if there no real reasons to make differences. ...snip... I would hope a real reason would be that the update is not a security or bugfix only update, right? IMHO it depends on what kind of software it is. I push releases of applications to all current Fedora releases. The users want the new features, it's what they have been bugging me for. If I was working on glibc or X I might not do that, but applications should be pushed back unless there is some system level constraint preventing it. So I too would like a commit to all branches or sync all branches to this one command. Cheers, Jeff. -- Jeff Fearn jfe...@redhat.com Software Engineer Engineering Operations Red Hat, Inc Freedom ... courage ... Commitment ... ACCOUNTABILITY Sure our competitors can rebuild the source but can they engage the customer the same way? -wmealing -- devel mailing list devel@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/devel
Re: Git commit in all available branches
On Fri, Oct 08, 2010 at 06:03:04PM +0400, Pavel Alexeev (aka Pahan-Hubbitus) wrote: In most cases I try sync all branches if there no real reasons to make differences. After made some changes in origin/master and commit is I also must do for each available branches something similar: fedpkg switch-branch el5; git pull git merge origin/master git push fedpkg build fedpkg update I find this works to apply the version from 'master' into the current (say, el5) branch. $ git merge -s recursive -X theirs master There are valid reasons for doing this - e.g. a bug fix release of a package by the upstream, that doesn't break the ABI. Thanks, Matt -- Matt Domsch Technology Strategist Dell | Office of the CTO -- devel mailing list devel@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/devel
Git commit in all available branches
In most cases I try sync all branches if there no real reasons to make differences. After made some changes in origin/master and commit is I also must do for each available branches something similar: fedpkg switch-branch el5; git pull git merge origin/master git push fedpkg build fedpkg update Off course I can script it with shell, but may be there already possibility to commit in few branches? Something like this: fedpkg commit -F clog -B f12,f13,f14,el5,el6 And will be very cool to start build and push updates (by single template interactively filled one time) also for several branches. -- With best wishes, Pavel Alexeev aka Pahan-Hubbitus. For fast contact with me you could use Jabber: hubbi...@jabber.ru -- devel mailing list devel@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/devel
Re: Git commit in all available branches
Paul Wouters wrote: On Fri, 8 Oct 2010, Pavel Alexeev (aka Pahan-Hubbitus) wrote: After made some changes in origin/master and commit is I also must do for each available branches something similar: fedpkg switch-branch el5; git pull git merge origin/master git push fedpkg build fedpkg update Does that not mangle the changelog of the different branches? Only if they diverge after they have been initially merged. If every branch is the same it makes history easier to track. -- devel mailing list devel@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/devel
Re: Git commit in all available branches
On Fri, 08 Oct 2010 18:03:04 +0400 Pavel Alexeev (aka Pahan-Hubbitus) fo...@hubbitus.com.ru wrote: In most cases I try sync all branches if there no real reasons to make differences. ...snip... I would hope a real reason would be that the update is not a security or bugfix only update, right? kevin signature.asc Description: PGP signature -- devel mailing list devel@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/devel
Re: Git commit in all available branches
On 10/08/2010 04:03 PM, Pavel Alexeev (aka Pahan-Hubbitus) wrote: In most cases I try sync all branches if there no real reasons to make differences. After made some changes in origin/master and commit is I also must do for each available branches something similar: fedpkg switch-branch el5; git pull git merge origin/master git push fedpkg build fedpkg update Off course I can script it with shell, but may be there already possibility to commit in few branches? Something like this: fedpkg commit -F clog -B f12,f13,f14,el5,el6 And will be very cool to start build and push updates (by single template interactively filled one time) also for several branches. +1. i like to do the same. -- Levente Si vis pacem para bellum! -- devel mailing list devel@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/devel
