You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by rw...@apache.org on 2011/10/28 06:00:49 UTC
svn commit: r1190149 - in /geronimo/server/branches: 3.0-beta-1/ 3.0-beta/
Author: rwonly
Date: Fri Oct 28 04:00:49 2011
New Revision: 1190149
URL: http://svn.apache.org/viewvc?rev=1190149&view=rev
Log:
better to use 3.0-beta as the branch folder name
Added:
geronimo/server/branches/3.0-beta/ (props changed)
- copied from r1190148, geronimo/server/branches/3.0-beta-1/
Removed:
geronimo/server/branches/3.0-beta-1/
Propchange: geronimo/server/branches/3.0-beta/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Fri Oct 28 04:00:49 2011
@@ -0,0 +1,4 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/m2migration:428851
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk:428882
+bdd66121-cd02-4950-91dc-3687ae657a63:/geronimo/server-trunk:16301
+bdd66121-cd02-4950-91dc-3687ae657a63:/geronimo/trunk-reorg:12578
Propchange: geronimo/server/branches/3.0-beta/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Oct 28 04:00:49 2011
@@ -0,0 +1,10 @@
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+*.log
+junit*.properties
+target
+bin
+.settings
Propchange: geronimo/server/branches/3.0-beta/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 28 04:00:49 2011
@@ -0,0 +1,2 @@
+/geronimo/server/branches/2.2:832538,885058
+/geronimo/server/branches/3.0-M1:948864,951792