On 6 Dec 2013, at 8:11, Lukasz Lenart wrote:
Do you know if git at Apache supports Pull Requests between branches?
I've started working like that some time ago and it's awesome feature
:-)
Honestly I don't know :-)
I mean you can merge between branches easily. Is that what you mean?
Regards
--
Łukasz
+ 48 606 323 122 http://www.lenart.org.pl/
2013/10/16 Christian Grobmeier <grobme...@gmail.com>:
On 16 Oct 2013, at 10:50, Lukasz Lenart wrote:
As far as I know, SvnPubSub doesn't support Git right now. So we can
migrate struts2/trunk to Git but the rest must stay as is. And if we
plan to migrate/create new user guide, it will be hosted via
Subversion. Any doubts?
+1
Regards
--
Łukasz
+ 48 606 323 122 http://www.lenart.org.pl/
2013/9/18 Rene Gielen <rene.gie...@gmail.com>:
+1
Am 18.09.13 11:38, schrieb Lukasz Lenart:
When 2.3.15.2 will be officially out, I want to send request to
Infra
for Svn to Git migration
2013/9/17 Christian Grobmeier <grobme...@gmail.com>:
thats fine :-) Now as we have that agreement, let's keep us
moving :)
Am 17.09.13 22:48, schrieb Rene Gielen:
I just wanted to get this clarified. Seems like we have an
agreement
:-)
Am 17.09.2013 21:14 schrieb "Christian Grobmeier"
<grobme...@gmail.com>:
Am 17.09.13 21:06, schrieb Johannes Geppert:
-1 for moving trunk only. We don't want to lose history, and
we
would
not want two repositories for one project (Struts 2). Once we
moved
to
git, the full struts2 svn tree should either be switched to
read-only
or/and later be removed.
Sure you are right the history should not be lost.
What I mean is not to migrate the struts1, archive, sandbox
and site into the new struts.git repository.
You speak of different things.
This is not to migrate:
http://svn.apache.org/repos/asf/struts/
and I believe Jo is against migrating the content of all of
that. I
agree with him.
We need to migrate this:
http://svn.apache.org/repos/asf/struts/struts2/
including branches (there are non in short time), tags and
trunk.
I bet you are on the same page here.
Johannes
#################################################
web: http://www.jgeppert.com
twitter: http://twitter.com/jogep
2013/9/13 Rene Gielen <rene.gie...@gmail.com>
+1 for git flow as the way to go, including excellent tooling
-
command
line extensions, Atlassian Sourcetree support and even a IDEA
plugin
(https://github.com/OpherV/gitflow4idea) help to make this an
elegant
abstract and reliable workflow.
-1 for moving trunk only. We don't want to lose history, and
we
would
not want two repositories for one project (Struts 2). Once we
moved
to
git, the full struts2 svn tree should either be switched to
read-only
or/and later be removed.
+1 for dealing with ../branches/STRUTS_3_X etc as
hierarchical
feature
branches from which single feature branches will be forked
for
actual
development - at least for now. I want to investigate further
on
this
one, but basically there should not be a problem if we start
like
this.
- René
Am 12.09.13 21:48, schrieb Johannes Geppert:
+1 for starting with the Git migration process.
What about only migrating the current svn struts2/trunk to
git and
leave
the rest in the svn repository?
If we need sometime also the site in git we can request a
separate
git
repository like struts-site.git.
Johannes
#################################################
web: http://www.jgeppert.com
twitter: http://twitter.com/jogep
2013/9/11 Lukasz Lenart <lukaszlen...@apache.org>
Hi,
I'd like to start discussion about the migration process -
there
are
few things we must clarify, at least:
- Git structure
- development flow
I think we should have just one repo:
git.apache.org/struts.git
and
diverse versions internally via branches - so the current
S2
source
become the base and then we will transfer it to 2.5 and 3
in the
future.
As a flow I like git-flow [1] - well known and used
[1] https://github.com/nvie/gitflow
Regards
--
Łukasz
+ 48 606 323 122 http://www.lenart.org.pl/
PS. It'll be implemented after cleaning up current pipeline
:-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org
--
René Gielen
http://twitter.com/rgielen
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org
--
René Gielen
http://twitter.com/rgielen
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org
---
http://www.grobmeier.de
@grobmeier
GPG: 0xA5CC90DB
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org
---
http://www.grobmeier.de
@grobmeier
GPG: 0xA5CC90DB
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org
