All pastes #39742 Raw Edit

Mine

public text v1 · immutable
#39742 ·published 2006-02-03 12:38 UTC
rendered paste body
$ svn merge -r2343:HEAD svn+ssh://user@svn.domain.com/opt/svn-repository/project/branches/project-2-2-1/project
C    Project/default.properties
A    Project/lib/core/jopc-bridge/jopc-bridge-0.3.1-dev.jar
Skipped missing target: 'Project/lib/core/jopc-bridge/jopc-bridge-0.1.jar'
Skipped missing target: 'Project/lib/core/jacob/jacob.dll'
Skipped missing target: 'Project/lib/core/jacob/jacob.jar'
Skipped missing target: 'Project/src/sql/Oracle/create.sql'
U    Project/src/sql/mySQL/create.sql
U    Project/src/sql/mySQL/drop.sql
C    Project/src/sql/mySQL/populate.sql
A    Project/src/sql/mySQL/bags.sql
Skipped missing target: 'Project/src/sql/SqlServer/create.sql'
U    Project/src/sql/upgrade/oracle-upgrade-1.6-1.8-04.sql
A    Project/src/sql/upgrade/oracle-upgrade-2.2.1-2.2.2-03.sql
A    Project/src/sql/upgrade/mysql-upgrade-2.2.5-2.2.6-01.sql
A    Project/src/sql/upgrade/oracle-upgrade-2.2.5-2.2.6-01.sql
A    Project/src/test/simulator/testData/blm.bat
U    Project/src/test/simulator/testData/loop.bat
U    Project/src/test/simulator/blm/blm-sim.bat
Skipped missing target: 'Project/src/test/no/bbc/project/services/fis/letis/LetisProcessDataTest.java'
Skipped missing target: 'Project/src/test/no/bbc/project/services/fis/letis'
Skipped missing target: 'Project/src/test/no/bbc/project/services/fis/FisMessageProcessorTest.java'
Skipped missing target: 'Project/src/test/no/bbc/project/services/fis'
svn: Working copy 'Project/src/test/no/bbc/project/services' is missing or not locked