[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[tm-cvs-commit] moberhuber org.eclipse.tm.rse/releng/org.eclipse.tm.releng/maps rse.map

Update of /cvsroot/tools/org.eclipse.tm.rse/releng/org.eclipse.tm.releng/maps
In directory dev1:/tmp/cvs-serv17625/maps

Modified Files:
      Tag: R3_2_maintenance
	rse.map 
Log Message:
Release into 3.2.2+ : Bug 338120 - Backport to 3.2.x Failed to copy the content of a tar file / Bug 337852 - Backport to 3.2.x File Content Conflict is not handled properly

Index: rse.map
===================================================================
RCS file: /cvsroot/tools/org.eclipse.tm.rse/releng/org.eclipse.tm.releng/maps/rse.map,v
retrieving revision 1.34.2.3
retrieving revision 1.34.2.4
diff -C2 -d -r1.34.2.3 -r1.34.2.4
*** rse.map	1 Feb 2011 15:14:56 -0000	1.34.2.3
--- rse.map	1 Mar 2011 17:30:16 -0000	1.34.2.4
***************
*** 1,11 ****
  !***************  PROJECT CONTRIBUTION  ******************************************************** 
  !*** Project's plugins, features and fragments
! feature@xxxxxxxxxxxxxxx=R32x_v201102011435,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse-feature
! feature@xxxxxxxxxxxxxxxxxxxx=R32x_v201102011435,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.core-feature
  feature@xxxxxxxxxxxxxxxxxxxxxx=R32x_v201102011435,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.dstore-feature
  feature@xxxxxxxxxxxxxxxxxxxxxxxx=v201005032000,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/examples/org.eclipse.rse.examples-feature
  feature@xxxxxxxxxxxxxxxxxxx=v201005221100,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.ftp-feature
! feature@xxxxxxxxxxxxxxxxxxxxx=R32x_v201102011435,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.local-feature
! feature@xxxxxxxxxxxxxxxxxxx=R32x_v201102011435,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.sdk-feature
  feature@xxxxxxxxxxxxxxxxxxx=v201005221100,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.ssh-feature
  feature@xxxxxxxxxxxxxxxxxxxxxx=v201005221100,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.telnet-feature
--- 1,11 ----
  !***************  PROJECT CONTRIBUTION  ******************************************************** 
  !*** Project's plugins, features and fragments
! feature@xxxxxxxxxxxxxxx=R32x_v201103011712,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse-feature
! feature@xxxxxxxxxxxxxxxxxxxx=R32x_v201103011712,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.core-feature
  feature@xxxxxxxxxxxxxxxxxxxxxx=R32x_v201102011435,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.dstore-feature
  feature@xxxxxxxxxxxxxxxxxxxxxxxx=v201005032000,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/examples/org.eclipse.rse.examples-feature
  feature@xxxxxxxxxxxxxxxxxxx=v201005221100,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.ftp-feature
! feature@xxxxxxxxxxxxxxxxxxxxx=R32x_v201103011712,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.local-feature
! feature@xxxxxxxxxxxxxxxxxxx=R32x_v201103011712,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.sdk-feature
  feature@xxxxxxxxxxxxxxxxxxx=v201005221100,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.ssh-feature
  feature@xxxxxxxxxxxxxxxxxxxxxx=v201005221100,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.telnet-feature
***************
*** 15,19 ****
  !!feature@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=v20080609a,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.useractions.wrapper-feature
  !!feature@xxxxxxxxxxxxxxxxxxxxxxxxxxxx=v20080609,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/releng/org.eclipse.tm.releng.master-feature
! plugin@xxxxxxxxxxxxxxxxxxxxxxx=R32x_v201102011435,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.dstore.core
  plugin@xxxxxxxxxxxxxxxxxxxxxxxxxx=v201005221130,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/doc/org.eclipse.dstore.doc.isv
  plugin@xxxxxxxxxxxxxxxxxxxxxxxx=v200907301400,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.dstore.extra
--- 15,19 ----
  !!feature@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=v20080609a,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.useractions.wrapper-feature
  !!feature@xxxxxxxxxxxxxxxxxxxxxxxxxxxx=v20080609,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/releng/org.eclipse.tm.releng.master-feature
! plugin@xxxxxxxxxxxxxxxxxxxxxxx=R32x_v201102121806,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.dstore.core
  plugin@xxxxxxxxxxxxxxxxxxxxxxxxxx=v201005221130,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/doc/org.eclipse.dstore.doc.isv
  plugin@xxxxxxxxxxxxxxxxxxxxxxxx=v200907301400,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.dstore.extra
***************
*** 31,35 ****
  plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=v200905272300,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/examples/org.eclipse.rse.examples.daytime
  plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=v200905272300,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/examples/org.eclipse.rse.examples.tutorial
! plugin@xxxxxxxxxxxxxxxxxxxxxxxx=R32x_v201102011435,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.files.ui
  plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxx=v201008191400,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.importexport
  plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxx=v201003010830,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.processes.ui
--- 31,35 ----
  plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=v200905272300,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/examples/org.eclipse.rse.examples.daytime
  plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=v200905272300,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/examples/org.eclipse.rse.examples.tutorial
! plugin@xxxxxxxxxxxxxxxxxxxxxxxx=R32x_v201103011712,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.files.ui
  plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxx=v201008191400,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.importexport
  plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxx=v201003010830,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.processes.ui
***************
*** 37,41 ****
  plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=R32x_v201102011435,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore
  plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=v201004072040,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.files.ftp
! plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=R32x_v201102011435,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.local
  plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxx=v200909160005,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.ssh
  plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=v200905272300,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.telnet
--- 37,41 ----
  plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=R32x_v201102011435,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore
  plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=v201004072040,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.files.ftp
! plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=R32x_v201103011712,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.local
  plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxx=v200909160005,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.ssh
  plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=v200905272300,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.telnet
***************
*** 61,64 ****
  plugin@xxxxxxxxxxxxxxxxxxxxx=v201006050745,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests
  plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=v200905272300,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests.framework
! plugin@xxxxxxxxxxxxxxxxxx=R32x_v201102011435,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.ui
  plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxx=v200905272300,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.useractions
\ No newline at end of file
--- 61,64 ----
  plugin@xxxxxxxxxxxxxxxxxxxxx=v201006050745,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests
  plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=v200905272300,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests.framework
! plugin@xxxxxxxxxxxxxxxxxx=R32x_v201103011712,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.ui
  plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxx=v200905272300,:pserver:anonymous:none@xxxxxxxxxxxxxxx:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.useractions
\ No newline at end of file