http://svnbook.red-bean.com/en/1.0/ch04s04.html


cd $pecos4/code/E2E/trunk/archive

svn update

cd $pecos4/code/E2E/trunk/archive/branches/EVLA_ARCHIVE_5.6.10_2009-09-16

pecos<1279>% svn log --stop-on-copy
------------------------------------------------------------------------
r3030 | jbenson | 2009-09-16 17:29:05 +0000 (Wed, 16 Sep 2009) | 1 line

5.6.19_2009-09-16
------------------------------------------------------------------------

cd /home/pecos4/jbenson/code/E2E/trunk/archive

pecos<1282>% svn merge -r 3030:HEAD
http://svn.aoc.nrao.edu/repos/SSS/archive/branches/EVLA_ARCHIVE_5.6.19_2009-09-16
svn: PROPFIND request failed on
'/repos/SSS/archive/branches/EVLA_ARCHIVE_5.6.19_2009-09-16'
svn: PROPFIND of
'/repos/SSS/archive/branches/EVLA_ARCHIVE_5.6.19_2009-09-16': 302 Found
(http://svn.aoc.nrao.edu)
pecos<1283>% svn merge -r 3030:HEAD
https://svn.aoc.nrao.edu/repos/SSS/archive/branches/EVLA_ARCHIVE_5.6.19_2009-09-16
U    src/java/edu/nrao/e2e/archive/ArchiveFetchUserProjects.java
U    src/java/edu/nrao/e2e/archive/ArchiveFetchUserXML.java
U    src/java/edu/nrao/e2e/archive/ArchiveFormsData.java
U    src/java/edu/nrao/e2e/archive/ArchiveTicketValidator.java
U    src/java/edu/nrao/e2e/archive/ArchiveUserInfo.java
A    src/resources/fetch-archive-user-xml.properties
U    src/webapp/WEB-INF/web.xml
C    src/webapp/advquery.jsp
U    src/webapp/archiveproject.jsp
U    pom.xml
pecos<1284>%

Now there is the new pom.xml from the branch in
$pecos3/code/E2E/trunk/archive

pecos<1287>% svn status | grep M
?      src/sql/createOBSSUMMARY_COLUMNS.sql
?      src/java/edu/nrao/e2e/archive/ArchiveURLMonitor.java.tst
M      src/java/edu/nrao/e2e/archive/ArchiveFetchUserProjects.java
M      src/java/edu/nrao/e2e/archive/ArchiveFetchUserXML.java
M      src/java/edu/nrao/e2e/archive/ArchiveFormsData.java
M      src/java/edu/nrao/e2e/archive/ArchiveTicketValidator.java
M      src/java/edu/nrao/e2e/archive/ArchiveUserInfo.java
M      src/python/fixArchivefilelocations.py
M      src/webapp/archiveproject.jsp
M      src/webapp/WEB-INF/web.xml
M      pom.xml

Yep, the branch file are there. Let's check them in now...

Still in $pecos3/code/E2E/trunk/archive

svn commit -m "Merged 3030:HEAD branch EVLA_ARCHIVE_5.6.20 into trunk.
Supports removable of fetch-user-xml methods."
Sending        webapp/WEB-INF/web.xml
Sending        webapp/advquery.jsp
Sending        webapp/archiveproject.jsp
Transmitting file data ...
Committed revision 3069.
pecos<1309>% cdc
/home/pecos4/jbenson/code/E2E/trunk/archive/src
pecos<1310>% cdc
/home/pecos4/jbenson/code/E2E/trunk/archive
pecos<1311>% svn commit -m "Merged 3030:HEAD branch EVLA_ARCHIVE_5.6.20
into trunk. Supports removable of fetch-user-xml methods."
Sending        pom.xml
Adding         src/docs/rebuildArchive.lis
Adding         src/docs/restartNGAS.lis
Sending        src/java/edu/nrao/e2e/archive/ArchiveFetchUserProjects.java
Sending        src/java/edu/nrao/e2e/archive/ArchiveFetchUserXML.java
Sending        src/java/edu/nrao/e2e/archive/ArchiveFormsData.java
Sending        src/java/edu/nrao/e2e/archive/ArchiveTicketValidator.java
Sending        src/java/edu/nrao/e2e/archive/ArchiveUserInfo.java
Sending        src/python/fixArchivefilelocations.py
Adding         src/resources/fetch-archive-user-xml.properties
Transmitting file data .........
Committed revision 3070.

/home/pecos4/jbenson/code/E2E/trunk/archive
pecos<1313>% svn update
At revision 3070.