geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1096964 - in /geronimo/server: trunk-copy/ trunk/
Date Tue, 26 Apr 2011 23:24:36 GMT
Author: djencks
Date: Tue Apr 26 23:24:36 2011
New Revision: 1096964

URL: http://svn.apache.org/viewvc?rev=1096964&view=rev
Log:
restore trunk from copy

Added:
    geronimo/server/trunk/   (props changed)
      - copied from r1096963, geronimo/server/trunk-copy/
Removed:
    geronimo/server/trunk-copy/

Propchange: geronimo/server/trunk/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Tue Apr 26 23:24:36 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/trunk/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Apr 26 23:24:36 2011
@@ -0,0 +1,10 @@
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+*.log
+junit*.properties
+target
+bin
+.settings

Propchange: geronimo/server/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Apr 26 23:24:36 2011
@@ -0,0 +1,2 @@
+/geronimo/server/branches/2.2:832538,885058
+/geronimo/server/branches/3.0-M1:948864,951792



Mime
View raw message