Could do: git rebase -i SHA after merging in the multi-commit change. that lets you amend each commit.
On Thu, Aug 30, 2012 at 2:20 PM, Shazron <[email protected]> wrote: > Great idea. If cherry picking, I believe doing a "git cherry-pick > --edit" will allow you to edit the commit message as well while > maintaining authorship. Don't know how it works with a multiple commit > merge though. > > On Wed, Aug 29, 2012 at 7:30 PM, Andrew Grieve <[email protected]> > wrote: > > We could probably make this a committer responsibility. E.g. do a commit > > --amend after merging in contributor change and before pushing. Just did > a > > test and it seems to maintain authorship. > > > > > > On Wed, Aug 29, 2012 at 1:57 PM, Shazron <[email protected]> wrote: > > > >> Or... how about we get everyone to have better commit notes, > >> preferably referencing a jira issue? (I can dream) ;) > >> > >> On Wed, Aug 29, 2012 at 10:55 AM, Filip Maj <[email protected]> wrote: > >> > Am unsure about relying on hand-massaged notes by Shaz for release > >> > creation. What if Shaz goes on vacation and no one does it? Let's just > >> try > >> > to get everything automated instead :P > >> > > >> > On 8/29/12 10:52 AM, "Steven Gill" <[email protected]> wrote: > >> > > >> >>That changelog file is just a git shortlog. I will see if I can get a > git > >> >>command to get rid of names. > >> >> > >> >>Shaz, I can probably switch coho to paste your release notes instead > or > >> at > >> >>least point to it. > >> >> > >> >>On Wed, Aug 29, 2012 at 10:33 AM, Shazron <[email protected]> wrote: > >> >> > >> >>> Also, like I've mentioned before the iOS changelog is usually not > >> >>> easily readable. I always compile cleaned up release notes here: > >> >>> > >> >>> > >> > https://github.com/apache/incubator-cordova-ios/blob/master/RELEASENOTES. > >> >>>md > >> >>> > >> >>> On Wed, Aug 29, 2012 at 10:11 AM, Filip Maj <[email protected]> wrote: > >> >>> > - I think we should include the directories of the > implementations > >> >>> > instead of more .zip files, at the top level > >> >>> > - remove all references to PhoneGap from the README. don't need > the > >> >>> > phonegap mailing list link. That would go in the phonegap dist :) > >> >>> > - I would also remove the names of the developers in the change > log > >> >>> > - the wiki link to cordova is wrong in the read me > >> >>> > > >> >>> > Other than that I think it's good! > >> >>> > > >> >>> > > >> >>> > On 8/28/12 5:47 PM, "Steven Gill" <[email protected]> wrote: > >> >>> > > >> >>> >>So I have done some work on coho on the src branch in the apache > >> >>>repo. I > >> >>> >>have uploaded 2.1.0rc1 release onto my apache page over at > >> >>> >>http://people.apache.org/~steven/. The readme needs some work > still > >> >>>and > >> >>> I > >> >>> >>have to update my tests for Coho. Anyone see any problems with > this > >> >>> >>release? > >> >>> >> > >> >>> >> > >> >>> >> > >> >>> >>On Mon, Aug 27, 2012 at 1:11 PM, Steven Gill < > [email protected] > >> > > >> >>> >>wrote: > >> >>> >> > >> >>> >>> Definitely doable. Only thing I have run into so far is that > minor > >> >>> issue > >> >>> >>> with git archive. > >> >>> >>> > >> >>> >>> If I do > >> >>> >>> > >> >>> >>> git archive --format zip -o incubator-cordova-android.zip > 2.1.0rc1 > >> >>> >>> This will archive based on the 2.1.0rc1 tag. Problem is, some of > >> >>>these > >> >>> >>> repos don't get tagged currently. Specifically, qt, mac, > >> >>>mobile-spec. > >> >>> >>>This > >> >>> >>> causes the git archive command to fail. We need to make sure we > are > >> >>> >>>tagging > >> >>> >>> those repos and have a VERSION file in the root of those repos. > >> >>> >>> > >> >>> >>> Alternatively, I could add a check to see if a VERSION file is > >> >>>present > >> >>> >>>and > >> >>> >>> updated to the current tag. If not, I could do a git archive > >> >>>--format > >> >>> >>>zip > >> >>> >>> -o incubator-cordova-android.zip HEAD. > >> >>> >>> > >> >>> >>> Other than this issue, I have an updated version of Coho on my > >> >>>machine > >> >>> >>> that pulls those repos, adds the readme and disclaimer files, > zips > >> + > >> >>> >>>signs > >> >>> >>> them. Plan is to have 2.1 be an official apache release. > >> >>> >>> > >> >>> >>> -Steve > >> >>> >>> > >> >>> >>> On Mon, Aug 27, 2012 at 9:03 AM, Filip Maj <[email protected]> > wrote: > >> >>> >>> > >> >>> >>>> Yep a git archive of the tag is all we need. Top-level > >> >>> >>>> license/notice/disclaimer files as Steve already has in his > >> >>>example. > >> >>> >>>> > >> >>> >>>> Definitely need cordova-js + the docs in there. Weinre, dunno, > Pat > >> >>> >>>>says no > >> >>> >>>> so that sounds good. What about the hello world app? Don't > think > >> >>>the > >> >>> >>>>labs > >> >>> >>>> repo should go in there either. > >> >>> >>>> > >> >>> >>>> As I see it we need to: > >> >>> >>>> > >> >>> >>>> - add a git archive of each repo into a directory at top-level > of > >> >>> >>>> distribution, so we would have: > >> >>> >>>> * android > >> >>> >>>> * app-hello-world > >> >>> >>>> * bada-wac > >> >>> >>>> * bada > >> >>> >>>> * blackberry > >> >>> >>>> * docs > >> >>> >>>> * iOS > >> >>> >>>> * js > >> >>> >>>> * mac > >> >>> >>>> * mobile-spec > >> >>> >>>> * qt > >> >>> >>>> * tizen > >> >>> >>>> * webos > >> >>> >>>> * wp7 > >> >>> >>>> - likely add a README file at the top explaining what each > >> >>>directory > >> >>> is > >> >>> >>>> and that you should package mobile-spec into an app built from > >> each > >> >>> >>>> platform to "run" the tests. > >> >>> >>>> > >> >>> >>>> Sign it. That's it. If not doable for 2.1 then definitely for > 2.2. > >> >>> >>>> > >> >>> >>>> > >> >>> >>>> On 8/16/12 8:14 PM, "Patrick Mueller" <[email protected]> > wrote: > >> >>> >>>> > >> >>> >>>> >On Thu, Aug 16, 2012 at 1:53 PM, Brian LeRoux <[email protected]> > >> wrote: > >> >>> >>>> > > >> >>> >>>> >> Yes should be all repos (even the less exciting ones) in src > >> >>>form. > >> >>> >>>> >> Ideally, a distribution of Cordova would use a Cordova src > >> >>>release > >> >>> >>>>to > >> >>> >>>> >> package itself. > >> >>> >>>> >> > >> >>> >>>> > > >> >>> >>>> >I was planning on weinre being a separate release from the > rest > >> of > >> >>> >>>> >Cordova. > >> >>> >>>> > ie, incubator-cordova-weinre WOULD NOT be part of the Cordova > >> >>> >>>>release. > >> >>> >>>> >Am > >> >>> >>>> >waiting for Cordova to go gold before weinre :-) > >> >>> >>>> > > >> >>> >>>> >-- > >> >>> >>>> >Patrick Mueller > >> >>> >>>> >http://muellerware.org > >> >>> >>>> > >> >>> >>>> > >> >>> >>> > >> >>> > > >> >>> > >> > > >> >
