Le vendredi 26 juillet 2013 01:05:44 Fred Cooke a écrit :
About the fork, though, I'm interested. I'm interested in why it's
maintained and how it differs. I'm interested because I intend to fork it
myself to fix things which would break others which I know won't change
upstream (site and
Le jeudi 25 juillet 2013 19:17:08 Brian Fox a écrit :
There is at least one Maven Committer who has been maintaining a fork of
Maven for perhaps the greater part of a year.
Is it really a fork? Or is it a superset? I think people throw around
fork but is that really true?
without:
-
I have a bunch of IRL stuff to deal with at the moment, and can't even work
on my own FOSS or proprietary code, so don't expect a fork soon.
When I say broken, don't be offended, few codebases aren't broken in some
way :-)
One example of broken is my SCM url being munged from this:
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
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.co...@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
Date: Sat, 27 Jul 2013 10:53:09 +0200
Subject: Re: [DISCUSS] Should the Maven PMC be an example of how we want the
Maven Community to behave (was Re: svn commit: r1506778 -
/maven/site/trunk/content/markdown/project-roles.md)
From: fred.co...@gmail.com
To: dev@maven.apache.org
I
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:
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.bout...@free.fr wrote:
the last 2 commits
No, you do NOT want to do a git pull, almost ever. You want to do a git
fetch, ensure you're not going to destroy other's good work, then if you're
just replacing same with same, force push. This is a risky operation for an
upstream to do as I mentioned above in my amendment. I would recommend
At Apache it is forbidden to rewrite the history of the master branch.
Which isn't so bad.
-
Arnaud
Le 27 juil. 2013 à 15:19, Jeff Jensen
jeffjen...@upstairstechnology.com a écrit :
That message indicates you need to git pull first. Even though you
may already have done so and no one
When you rewrite history of something that has been already pushed, you
need to push and add --force to rewrite history on the remote repo.
Of course, as Fred mentioned, this isn't recommended for branches that have
been pulled by other people, because it will mess their next pull.
Vincent
On Sat, Jul 27, 2013 at 3:36 PM, Arnaud Héritier aherit...@gmail.comwrote:
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
My most humble apologies to Herve for leading you astray! I was unaware of
the policy on this. I hope that I didn't inadvertently cause any harm.
On Sat, Jul 27, 2013 at 3:38 PM, Fred Cooke fred.co...@gmail.com wrote:
On Sat, Jul 27, 2013 at 3:36 PM, Arnaud Héritier aherit...@gmail.comwrote:
On Sat, Jul 27, 2013 at 8:38 AM, Fred Cooke fred.co...@gmail.com wrote:
On Sat, Jul 27, 2013 at 3:36 PM, Arnaud Héritier aherit...@gmail.comwrote:
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
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 the build.
Writing good comments should help everybody to understand why a commit is
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 the latest public
too. Wash
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
(although I use the GUI for it)
Robert
Op Sat, 27 Jul 2013 16:07:09 +0200 schreef Fred Cooke
fred.co...@gmail.com:
Good practice is to work on a
How did I know you'd say that? You think I didn't know you could do that?
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 rfscho...@apache.orgwrote:
With SVN changing a bad comment wasn't even possible
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 do that?
LOL :-p
Can't
so http://maven.apache.org/developers/conventions/git.html#Edit_Commit_Message
is wrong? or ok only if not pushed?
Le samedi 27 juillet 2013 15:36:03 Arnaud Héritier a écrit :
At Apache it is forbidden to rewrite the history of the master branch.
Which isn't so bad.
-
Arnaud
Le
It's ok if not pushed, but I think it should be made a lot clearer in the guide.
We could install commit hooks into the repo that enforce specific
patterns on commits,
like [\d].* *or* starts with an o . But then again the o seems to
be under attack too :)
Kristian
2013/7/27 Hervé BOUTEMY
:-) 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
Is there a problem you're trying to fix or have you just been taking too
many vitamin pills ?
Kristian
2013/7/27 Fred Cooke fred.co...@gmail.com:
:-) Tui, yeah right. [1][2]
Or work on branches, pushed publicly with meaningful names like
attempt-fix-of-site-behaviour or whatever and seek
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 the
Apache Maven project due to the number of active committers. It would slow
things down even more.
Robert
Op Sat, 27 Jul 2013 17:04:18 +0200 schreef
Not perfect but what you could do is to add a git note on this commit.
-
Arnaud
Le 27 juil. 2013 à 13:29, Hervé BOUTEMY herve.bout...@free.fr a écrit :
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
On 28 July 2013 00:24, Kristian Rosenvold kristian.rosenv...@gmail.com wrote:
It's ok if not pushed, but I think it should be made a lot clearer in the
guide.
Do we have a how to guide for using Git?
-
To unsubscribe, e-mail:
The Maven team is pleased to announce the release of the Apache Maven
IDEA Plugin, version 2.2.1.
As you can see in the release notes below, this plugin has now been
retired. There will be no more releases of this plugin.
Generates project files for usage with IntelliJ IDEA from the POM.
The Maven team is pleased to announce the release of the Apache Maven
Model Converter, version 2.3
As you can see in the release notes below, this shared component is now retired.
Most likely it will be transferred to the Apache Archiva project.
Converts between version 3.0.0 and version 4.0.0
The Maven team is pleased to announce the release of the Apache Maven
Model Converter, version 2.3
As you can see in the release notes below, this shared component is now retired.
Most likely it will be transferred to the Apache Archiva project.
Converts between version 3.0.0 and version 4.0.0
As a result of a recent vote on the Maven Developers list the decision has
been made to discontinue support for running Maven itself using Java 5.0.
The Maven 2.0.x release line has a minimum Java requirement of 1.4
The Maven 2.1.x, 2.2.x, 3.0.x and 3.1.x release lines all have a minimum
Java
Hi,
We solved 4 issues:
http://jira.codehaus.org/secure/ReleaseNote.jspa?projectId=11241styleName=Htmlversion=13719
There are still a couple of issues left in JIRA:
http://jira.codehaus.org/secure/IssueNavigator.jspa?reset=truepid=11241status=1
Staging repo:
I don't think we have many things on Maven project side and really few
things on apache side
About the workflow to use with git you have the well known successful
branching model
http://nvie.com/posts/a-successful-git-branching-model/
At work I adapted / completed it for our internal usage (maybe
http://maven.apache.org/guides/mini/guide-http-settings.html
This page refers to Maven 3.0.4, but I guess we need to say something
about the security-fix of 3.0.5, right?
If I knew all details I would have fixed this myself, but I don't. Anybody
else who can improve this page?
Robert
This ought to keep you out of trouble if you're a downstream user:
NEVER git pull
NEVER git merge
ALWAYS git fetch remote
ALWAYS git merge --ff-only remote/branch
ALWAYS git rebase remote/branch
[image: http://stuff.fredcooke.com/IDontAlwaysMergeButWhenIDoI.jpg]
rebase -i is your friend if used
On 28 July 2013 07:45, Fred Cooke fred.co...@gmail.com wrote:
[1] http://pragprog.com/the-pragmatic-programmer/extracts/coincidence
Ahh I see they are using you as an example :)
-
To unsubscribe, e-mail:
Yes, I've been guilty of it from time to time, as most have been,
especially years ago ;-)
Did you find any of the above useful? I hope so :-)
Coincidental-Fred.
On Sun, Jul 28, 2013 at 12:26 AM, Barrie Treloar baerr...@gmail.com wrote:
On 28 July 2013 07:45, Fred Cooke fred.co...@gmail.com
On 27 July 2013 23:31, Fred Cooke fred.co...@gmail.com wrote:
Yes, I've been guilty of it from time to time, as most have been,
especially years ago ;-)
Did you find any of the above useful? I hope so :-)
I don't know (yet), but I do know that it would be a lot easier to
reference as a web
37 matches
Mail list logo
