maven-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Fred Cooke <fred.co...@gmail.com>
Subject 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.
Date Sat, 27 Jul 2013 13:38:21 GMT
On Sat, Jul 27, 2013 at 3:36 PM, Arnaud Héritier <aheritier@gmail.com>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! :-)


>
> ---------
> Arnaud
>
> Le 27 juil. 2013 à 15:19, Jeff Jensen
> <jeffjensen@upstairstechnology.com> a écrit :
>
> > That message indicates you need to git pull first.  Even though 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 <herve.boutemy@free.fr>
> 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 last one, but
> when I git
> >> push, I get
> >>
> >> To https://git-wip-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'
> >> 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 configured to 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, they will hate
> you,
> >>> and it should be left as is.
> >>>
> >>> On Sat, Jul 27, 2013 at 1:36 PM, Fred Cooke <fred.cooke@gmail.com>
> 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 one of interest
> for
> >>>> comment edit and proceed.
> >>>>
> >>>> On Sat, Jul 27, 2013 at 1:28 PM, Hervé BOUTEMY
> >> <herve.boutemy@free.fr>wrote:
> >>>>> IIUC, this is a fix to https://jira.codehaus.org/browse/MNG-5499
> >>>>>
> >>>>> I'm not a git blackbelt: can the comment be updated to add 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 jvanzyl@apache.org 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
> >>>>>> Commit:
> http://git-wip-us.apache.org/repos/asf/maven/commit/e084ff3b
> >>>>>> Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/e084ff3b
> >>>>>> Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/e084ff3b
> >>>>>>
> >>>>>> Branch: refs/heads/master
> >>>>>> Commit: e084ff3b8c04bdfdac62a28a1bef8ec87762d4dc
> >>>>>> Parents: 0609504
> >>>>>> Author: Jason van Zyl <jason@tesla.io>
> >>>>>> Authored: Fri Jul 26 21:09:50 2013 -0400
> >>>>>> Committer: Jason van Zyl <jason@tesla.io>
> >>>>>> 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/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: dev-unsubscribe@maven.apache.org
> >>>>> For additional commands, e-mail: dev-help@maven.apache.org
> >>
> >> ---------------------------------------------------------------------
> >> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> >> For additional commands, e-mail: dev-help@maven.apache.org
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> > For additional commands, e-mail: dev-help@maven.apache.org
> >
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
>

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message