Re: [2/2] git commit: o change the scope of org.eclipse.sisu to test in the maven-aether-provider to prevent it from leaking out to clients.

Robert Scholte Sat, 27 Jul 2013 08:16:09 -0700

SVN's 1 level commit vs. GIT's 2+1 level commit: I'd say it's a tie.

Let me be a bit pessimistic, but I don't think that'll work here with theApache Maven project due to the number of active committers. It would slowthings down even more.


Robert

Op Sat, 27 Jul 2013 17:04:18 +0200 schreef Fred Cooke<[email protected]>:

:-) Tui, yeah right. [1][2]

Or work on branches, pushed publicly with meaningful names like
attempt-fix-of-site-behaviour or whatever and seek peer review before
rebasing and applying to master. IMO this should apply to Maven "gods" as
much to any other committer. No one is incapable of making mistakes.

Those private branches of mine, I self review the entire diff and comment
of every commit multiple times before I publish if publishing directly to

my main branches. I amend and adjust and tweak them until they're asclose

to perfectly formed as possible. If I'm pushing to temp branches, I let
others help with the review first ;-)

Fred.

[1] http://www.tui.co.nz/Competitions/Yeah-Right
[2]
http://2.bp.blogspot.com/-lA11480KeR0/Tnsy7llzTXI/AAAAAAAAA5Y/hHfTeCes9eg/s1600/Tui-Yeah-Right-Calendar-Girls-Billboard.jpg

On Sat, Jul 27, 2013 at 4:45 PM, Hervé BOUTEMY<[email protected]>wrote:

so, this time:
svn +1
git -1

:)

more seriously: if we cannot fix comments later, we'll need to be more
careful
when committing

Regards,

Hervé

Le samedi 27 juillet 2013 16:27:50 Fred Cooke a écrit :

> How did I know you'd say that? You think I didn't know you could dothat?

> LOL :-p
>
> Can't do it without bad config and/or administrator privileges. There,
> fixed.
>
> Fred.
>
> On Sat, Jul 27, 2013 at 4:22 PM, Robert Scholte <[email protected]
>wrote:
> > "With SVN changing a bad comment wasn't even possible"
> >
> > Yes it is, I've done it very often:
> > http://subversion.apache.org/**faq.html#change-log-msg<
http://subversion.a
> > pache.org/faq.html#change-log-msg> (although I use the GUI for it)
> >
> > Robert
> >
> > Op Sat, 27 Jul 2013 16:07:09 +0200 schreef Fred Cooke <
> >
> > [email protected]>:
> >  Good practice is to work on a branch anyway, then you're free to do
> >
> >> whatever you wish. I have ~30 branches in my private copy of my
project

> >> right now. When one matures I rebase it onto the latest public,then> >> publish it. Then I rebase the others periodically up onto thelatest

> >> public
> >> too. Wash rinse repeat.
> >>

> >> With SVN changing a bad comment wasn't even possible, so stating"no

> >> amending master" isn't really a restriction at all. It's just good
> >> practice.
> >>
> >> Fred.
> >>

> >> On Sat, Jul 27, 2013 at 4:00 PM, Robert Scholte<[email protected]

> >>
> >> >wrote:
> >>  I'm actually kind of surprised. I'm learning my co-workers that
comments
> >>
> >>> are very important. With a buildserver it has become very easy to
have
> >>> an

> >>> overview of the latest commits and understand what broke thebuild.

> >>> Writing good comments should help everybody to understand why a
commit
> >>> is
> >>> done (yes: why. Not 'what', that's already easy to figure out). So
I'm

> >>> really in favor to being able change comments, because badcomments

are
> >>> sometimes even worse than no comments.
> >>>

> >>> Just like Hervé, I'd really prefer to see if a commit is done fora> >>> specific issue or not. In this case I would have liked to see afix

on
> >>> the
> >>> comment if possible, because the current comment is incomplete.
> >>>
> >>> Anyhow, now I know about this.
> >>>
> >>> Robert
> >>>
> >>>

> >>> Op Sat, 27 Jul 2013 15:40:05 +0200 schreef Jeff Jensen<jeffjensen@

**
> >>> upstairstechnology.com
> >>> <jeffjensen@**upstairstechnology.com<
[email protected]>>>>

> >>> On Sat, Jul 27, 2013 at 8:38 AM, Fred Cooke<[email protected]>

> >>>
> >>> wrote:
> >>>>  On Sat, Jul 27, 2013 at 3:36 PM, Arnaud Héritier <
[email protected]
> >>>>
> >>>>> >wrote:
> >>>>>  At Apache it is forbidden to rewrite the history of the master
> >>>>>  branch.
> >>>>>
> >>>>>> Which isn't so bad.
> >>>>>>
> >>>>>>  Ahh, this is a very sound policy! Someone is switched on! :-)
> >>>>
> >>>> Yes, very good!
> >>>>
> >>>>  ---------
> >>>>
> >>>>> Arnaud
> >>>>>
> >>>>>> Le 27 juil. 2013 à 15:19, Jeff Jensen
> >>>>>> <jeffjensen@**upstairstechnolo**gy.com<
http://upstairstechnology.com>
> >>>>>> <jeffjensen@**upstairstechnology.com<
[email protected]
> >>>>>> m>
> >>>>>>
> >>>>>> a écrit :

> >>>>>> > That message indicates you need to git pull first. Eventhough

you

> >>>>>> > may already have done so and no one else has pushed since,this

> >>>>>>
> >>>>>> usually
> >>>>>>
> >>>>>> > happens when modifying a commit that has been pushed/shared.
> >>>>>> >
> >>>>>> > On Sat, Jul 27, 2013 at 8:08 AM, Hervé BOUTEMY <
> >>>>>>
> >>>>>> [email protected]
> >>>>>>
> >>>>>> wrote:
> >>>>>> >> the last 2 commits are to be amended: lst one for MNG-5499,
> >>>>>>
> >>>>>> previous
> >>>>>> one for
> >>>>>>
> >>>>>> >> MNG-5495
> >>>>>> >>

> >>>>>> >> I tried git commit --amend -m "[MNG-5499]..." for the lastone,

> >>>>>> >> but
> >>>>>>
> >>>>>> when I git
> >>>>>>
> >>>>>> >> push, I get
> >>>>>> >>
> >>>>>> >> To
> >>>>>> >> https://git-wip-us.apache.org/****repos/asf/maven.git<
https://git
> >>>>>> >> -wip-us.apache.org/**repos/asf/maven.git>>>>>>>
> >>>>>> <https://**git-wip-us.apache.org/repos/**asf/maven.git<
https://git-wi
> >>>>>> p-us.apache.org/repos/asf/maven.git>>>>>>>
> >>>>>> >> ! [rejected]        master -> master (non-fast-forward)
> >>>>>> >> error: failed to push some refs to '
> >>>>>>
> >>>>>> https://git-wip-us.apache.org/****repos/asf/maven.git<
https://git-wip
> >>>>>> -us.apache.org/**repos/asf/maven.git>
> >>>>>> <https://**git-wip-us.apache.org/repos/**asf/maven.git<
https://git-w
> >>>>>> ip-us.apache.org/repos/asf/maven.git>
> >>>>>>
> >>>>>>
> >>>>>> '
> >>>>>>
> >>>>>> >> hint: Updates were rejected because the tip of your current
branch
> >>>>>>
> >>>>>> is
> >>>>>> behind
> >>>>>>
> >>>>>> >> hint: its remote counterpart. Merge the remote changes (e.g.
'git
> >>>>>>
> >>>>>> pull')
> >>>>>>
> >>>>>> >> hint: before pushing again.

> >>>>>> >> hint: See the 'Note about fast-forwards' in 'git push--help'

for
> >>>>>>
> >>>>>> details.
> >>>>>>

> >>>>>> >> Did I do something wrong? Or git repo at ASF is configuredto

> >>>>>> >> avoid
> >>>>>>
> >>>>>> such
> >>>>>>
> >>>>>> >> things?
> >>>>>> >>
> >>>>>> >> Regards,
> >>>>>> >>
> >>>>>> >> Hervé
> >>>>>> >>
> >>>>>> >> Le samedi 27 juillet 2013 13:37:12 Fred Cooke a écrit :

> >>>>>> >>> Of course, if anyone is working down stream of this, theywill

> >>>>>>
> >>>>>> hate
> >>>>>> you,
> >>>>>>
> >>>>>> >>> and it should be left as is.
> >>>>>> >>>
> >>>>>> >>> On Sat, Jul 27, 2013 at 1:36 PM, Fred Cooke <
[email protected]
> >>>>>>
> >>>>>> wrote:
> >>>>>> >>>> Yes, easily, if it's the HEAD just do a --amend on it and
update
> >>>>>>
> >>>>>> it
> >>>>>>
> >>>>>> >>>> yourself, Jason's name will be retained. If it's not HEAD
then
> >>>>>> >>>> do
> >>>>>>
> >>>>>> rebase
> >>>>>>
> >>>>>> >>>> -i

> >>>>>> >>>> <previous hash to the one of interest> then mark the oneof

> >>>>>>
> >>>>>> interest
> >>>>>> for
> >>>>>>
> >>>>>> >>>> comment edit and proceed.
> >>>>>> >>>>
> >>>>>> >>>> On Sat, Jul 27, 2013 at 1:28 PM, Hervé BOUTEMY
> >>>>>> >>
> >>>>>> >> <[email protected]>wrote:
> >>>>>> >>>>> IIUC, this is a fix to https://jira.codehaus.org/**
> >>>>>>
> >>>>>> browse/MNG-5499
> >>>>>> <https://jira.codehaus.org/**browse/MNG-5499<
https://jira.codehaus.o
> >>>>>> rg/browse/MNG-5499>>>>>>>

> >>>>>> >>>>> I'm not a git blackbelt: can the comment be updated toadd

the
> >>>>>>
> >>>>>> classical
> >>>>>>
> >>>>>> >>>>> [MNG-5499]?
> >>>>>> >>>>> (and next time not be forgotten from initial comment :) )
> >>>>>> >>>>>
> >>>>>> >>>>> I'm adding a reference to the commit in the Jira issue
> >>>>>> >>>>>
> >>>>>> >>>>> Regards,
> >>>>>> >>>>>
> >>>>>> >>>>> Hervé
> >>>>>> >>>>>
> >>>>>> >>>>> Le samedi 27 juillet 2013 01:45:44 [email protected] a
écrit :
> >>>>>> >>>>>> o change the scope of org.eclipse.sisu to test in the
> >>>>>> >>>>>
> >>>>>> >>>>> maven-aether-provider
> >>>>>> >>>>>
> >>>>>> >>>>>> to prevent it from leaking out to clients.
> >>>>>> >>>>>>
> >>>>>> >>>>>>
> >>>>>> >>>>>> Project:
> >>>>>> >>>>>> http://git-wip-us.apache.org/****repos/asf/maven/repo
<http://
> >>>>>> >>>>>> git-wip-us.apache.org/**repos/asf/maven/repo>>>>>>>
> >>>>>> <http://**git-wip-us.apache.org/repos/**asf/maven/repo<
http://git-wip
> >>>>>> -us.apache.org/repos/asf/maven/repo>>>>>>>
> >>>>>> >>>>>> Commit:
> >>>>>>
http://git-wip-us.apache.org/****repos/asf/maven/commit/****e084ff3b<

> >>>>>>http://git-wip-us.apache.org/**repos/asf/maven/commit/**e084ff3b>> >>>>>><http://git-wip-us.**apache.org/repos/asf/maven/**commit/e084ff3b

<ht

> >>>>>>tp://git-wip-us.apache.org/repos/asf/maven/commit/e084ff3b>>>>>>>

> >>>>>> >>>>>> Tree:
> >>>>>> >>>>>> http://git-wip-us.apache.org/****<
http://git-wip-us.apache.or
> >>>>>> >>>>>> g/**>
> >>>>>>
> >>>>>> repos/asf/maven/tree/e084ff3b<**http://git-wip-us.apache.org/**
> >>>>>> repos/asf/maven/tree/e084ff3b<
http://git-wip-us.apache.org/repos/asf/
> >>>>>> maven/tree/e084ff3b>>>>>>>
> >>>>>> >>>>>> Diff:
> >>>>>> >>>>>> http://git-wip-us.apache.org/****<
http://git-wip-us.apache.or
> >>>>>> >>>>>> g/**>
> >>>>>>
> >>>>>> repos/asf/maven/diff/e084ff3b<**http://git-wip-us.apache.org/**
> >>>>>> repos/asf/maven/diff/e084ff3b<
http://git-wip-us.apache.org/repos/asf/
> >>>>>> maven/diff/e084ff3b>>>>>>>
> >>>>>> >>>>>> Branch: refs/heads/master
> >>>>>> >>>>>> Commit: e084ff3b8c04bdfdac62a28a1bef8e****c87762d4dc
> >>>>>> >>>>>>
> >>>>>> >>>>>> Parents: 0609504
> >>>>>> >>>>>> Author: Jason van Zyl <[email protected]>
> >>>>>> >>>>>> Authored: Fri Jul 26 21:09:50 2013 -0400
> >>>>>> >>>>>> Committer: Jason van Zyl <[email protected]>
> >>>>>> >>>>>> Committed: Fri Jul 26 21:09:50 2013 -0400
> >>>>>>
> >>>>>>
------------------------------****----------------------------**--**
> >>>>>>
> >>>>>> ----------
> >>>>>>
> >>>>>> >>>>>> maven-aether-provider/pom.xml | 30
> >>>>>>
> >>>>>> ++++++++++++++++--------------
> >>>>>>
> >>>>>> >>>>>> 1 file changed, 16 insertions(+), 14 deletions(-)
> >>>>>>
> >>>>>>
------------------------------****----------------------------**--**
> >>>>>> ----------
> >>>>>>
> >>>>>>
> >>>>>>
http://git-wip-us.apache.org/****repos/asf/maven/blob/**e084ff3b/**<h
> >>>>>> ttp://git-wip-us.apache.org/**repos/asf/maven/blob/e084ff3b/**>

> >>>>>>maven-aether-p<http://git-wip-**us.apache.org/repos/asf/maven/**

> >>>>>> blob/e084ff3b/maven-aether-p<
http://git-wip-us.apache.org/repos/asf/m
> >>>>>> aven/blob/e084ff3b/maven-aether-p>>>>>>>
> >>>>>> >>>>> rov>>
> >>>>>> >>>>>
> >>>>>> >>>>>> ider/pom.xml
> >>>>>>
> >>>>>>
------------------------------****----------------------------**--**
> >>>>>> ----------
> >>>>>>
> >>>>>> >>>>> diff
> >>>>>> >>>>>
> >>>>>> >>>>>> --git a/maven-aether-provider/pom.****xml
> >>>>>>
> >>>>>> b/maven-aether-provider/pom.****xml
> >>>>>>
> >>>>>> >>>>> index
> >>>>>> >>>>>
> >>>>>> >>>>>> 910fab6..9235f1c 100644
> >>>>>> >>>>>> --- a/maven-aether-provider/pom.****xml
> >>>>>> >>>>>> +++ b/maven-aether-provider/pom.****xml
> >>>>>> >>>>>>
> >>>>>> >>>>>> @@ -63,20 +63,6 @@ under the License.
> >>>>>> >>>>>>
> >>>>>> >>>>>>       <artifactId>aether-impl</****artifactId>
> >>>>>> >>>>>>
> >>>>>> >>>>>>     </dependency>
> >>>>>> >>>>>>     <dependency>
> >>>>>> >>>>>>
> >>>>>> >>>>>> -      <groupId>org.eclipse.aether</****groupId>

> >>>>>> >>>>>> -<artifactId>aether-connector-****wagon</artifactId>

> >>>>>> >>>>>>
> >>>>>> >>>>>> -      <scope>test</scope>
> >>>>>> >>>>>> -    </dependency>
> >>>>>> >>>>>> -    <dependency>
> >>>>>> >>>>>> -      <groupId>org.apache.maven.****wagon</groupId>
> >>>>>> >>>>>> -      <artifactId>wagon-file</****artifactId>
> >>>>>> >>>>>>
> >>>>>> >>>>>> -      <scope>test</scope>
> >>>>>> >>>>>> -    </dependency>
> >>>>>> >>>>>> -    <dependency>
> >>>>>> >>>>>> -      <groupId>org.eclipse.sisu</****groupId>

> >>>>>> >>>>>> -<artifactId>org.eclipse.sisu.****plexus</artifactId>

> >>>>>> >>>>>> -    </dependency>
> >>>>>> >>>>>> -    <dependency>
> >>>>>> >>>>>>
> >>>>>> >>>>>>       <groupId>org.codehaus.plexus</****groupId>
> >>>>>> >>>>>>       <artifactId>plexus-component-***
> >>>>>>
> >>>>>> *annotations</artifactId>
> >>>>>>
> >>>>>> >>>>>>     </dependency>
> >>>>>> >>>>>>
> >>>>>> >>>>>> @@ -96,6 +82,22 @@ under the License.
> >>>>>> >>>>>>
> >>>>>> >>>>>>         </exclusion>
> >>>>>> >>>>>>
> >>>>>> >>>>>>       </exclusions>
> >>>>>> >>>>>>
> >>>>>> >>>>>>     </dependency>
> >>>>>> >>>>>>
> >>>>>> >>>>>> +    <!-- Testing -->
> >>>>>> >>>>>> +    <dependency>
> >>>>>> >>>>>> +      <groupId>org.eclipse.aether</****groupId>

> >>>>>> >>>>>> +<artifactId>aether-connector-****wagon</artifactId>

> >>>>>> >>>>>>
> >>>>>> >>>>>> +      <scope>test</scope>
> >>>>>> >>>>>> +    </dependency>
> >>>>>> >>>>>> +    <dependency>
> >>>>>> >>>>>> +      <groupId>org.apache.maven.****wagon</groupId>
> >>>>>> >>>>>> +      <artifactId>wagon-file</****artifactId>
> >>>>>> >>>>>>
> >>>>>> >>>>>> +      <scope>test</scope>
> >>>>>> >>>>>> +    </dependency>
> >>>>>> >>>>>> +    <dependency>
> >>>>>> >>>>>> +      <groupId>org.eclipse.sisu</****groupId>

> >>>>>> >>>>>> +<artifactId>org.eclipse.sisu.****plexus</artifactId>

> >>>>>> >>>>>>
> >>>>>> >>>>>> +      <scope>test</scope>
> >>>>>> >>>>>> +    </dependency>
> >>>>>> >>>>>>
> >>>>>> >>>>>>   </dependencies>
> >>>>>> >>>>>>
> >>>>>> >>>>>>   <build>
> >>>>>> >>>>>
> >>>>>> >>>>>
------------------------------****----------------------------*
> >>>>>>
> >>>>>> *--**
> >>>>>> ---------
> >>>>>>
> >>>>>> >>>>> To unsubscribe, e-mail: [email protected].
****org<
> >>>>>>
> >>>>>> dev-unsubscribe@maven.**apache.org <
[email protected]>
> >>>>>>

> >>>>>> >>>>> For additional commands, e-mail:[email protected]

> >>>>>> >>
> >>>>>> >>
------------------------------****----------------------------**
> >>>>>>
> >>>>>> --**
> >>>>>> ---------
> >>>>>>

> >>>>>> >> To unsubscribe, e-mail:[email protected].****org<

> >>>>>>
> >>>>>> dev-unsubscribe@maven.**apache.org <
[email protected]>
> >>>>>>
> >>>>>> >> For additional commands, e-mail: [email protected]
> >>>>>> >

> >>>>>> >------------------------------****----------------------------**

> >>>>>>
> >>>>>> --**
> >>>>>> ---------
> >>>>>>
> >>>>>> > To unsubscribe, e-mail: [email protected].****org<
> >>>>>>
> >>>>>> dev-unsubscribe@maven.**apache.org <
[email protected]>
> >>>>>>
> >>>>>> > For additional commands, e-mail: [email protected]
> >>>>>>
> >>>>>>
------------------------------****----------------------------**--**
> >>>>>> ---------
> >>>>>> To unsubscribe, e-mail: [email protected].****org<
> >>>>>> dev-unsubscribe@maven.**apache.org <
[email protected]>
> >>>>>>
> >>>>>>
> >>>>>> For additional commands, e-mail: [email protected]
> >>>>>>

> >>>>>>------------------------------****----------------------------**

> >>>>
> >>>> --**---------
> >>>> To unsubscribe, e-mail: [email protected].****org<
> >>>> dev-unsubscribe@maven.**apache.org <
[email protected]>>
> >>>>
> >>>> For additional commands, e-mail: [email protected]
> >>>
> >>> ------------------------------****----------------------------**
> >>> --**---------
> >>> To unsubscribe, e-mail: [email protected].****org<

> >>> dev-unsubscribe@maven.**apache.org<[email protected]

>>
> >>>
> >>> For additional commands, e-mail: [email protected]
> >
> >
------------------------------**------------------------------**---------
> > To unsubscribe, e-mail:
> > [email protected].**org<[email protected]>
For
> > additional commands, e-mail: [email protected]

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Re: [2/2] git commit: o change the scope of org.eclipse.sisu to test in the maven-aether-provider to prevent it from leaking out to clients.

Reply via email to