SVN->ClearCase Sync Use Cases by 2icPT9d

VIEWS: 22 PAGES: 17

									                          SVN->ClearCase Sync Use Cases


1. Adds on sync branch
      a. Adding a file on the top level and then adding a directory structure within the
         current structure (includes directories and files).
              i. Added a top level file – addonsynctop.txt
             ii. Added a directory 3 levels down – subdir3b
            iii. Added a file in that directory – addonsync1.txt
            iv. Added a directory below that one – subdir3b-1
             v. Added a directory below that one – subdir3b-2
            vi. Added a file in that directory – addonsync2.txt
      b. svn log reports:
           r5 | rjenkins | 2004-07-08 23:44:23 -0400 (Thu, 08 Jul 2004) | 1 line
           Changed paths:
             A /branches/workbranch/addonsynctop.txt
             A /branches/workbranch/src/subdir1/subdir2/subdir3b
             A /branches/workbranch/src/subdir1/subdir2/subdir3b/addonsync1.txt
             A /branches/workbranch/src/subdir1/subdir2/subdir3b/subdir3b-1
             A /branches/workbranch/src/subdir1/subdir2/subdir3b/subdir3b-1/subdir3b-2
             A /branches/workbranch/src/subdir1/subdir2/subdir3b/subdir3b-1/subdir3b-2/addonsync2.txt
2. Modifications on sync branch
     a. Modifying a file on the top level and then files further within the structure.
               i. Modified top level file – addonsynctop.txt
              ii. Modified file 3 levels down – SlideXid.java
             iii. Modified file 5 levels down – Lock.java
     b. svn log reports:
           r6 | rjenkins | 2004-07-08 23:56:54 -0400 (Thu, 08 Jul 2004) | 1 line
           Changed paths:
             M /branches/workbranch/addonsynctop.txt
             M /branches/workbranch/src/subdir1/subdir2/subdir3/lock/Lock.java
             M /branches/workbranch/src/subdir1/transaction/SlideXid.java
3. Deletions on sync branch
      a. Deleting a file on the top level, deleting a file in a lower level, and deleting a
          directory structure including a file.
               i. Deleted top level file – addonsynctop.txt
              ii. Deleted a file – addonsync1.txt
             iii. Deleted a directory structure – subdir3b-1 (included subdir3b-2 and the
                  file addonsync2.txt)
      b. svn log reports:
           r7 | rjenkins | 2004-07-09 00:03:06 -0400 (Fri, 09 Jul 2004) | 1 line
           Changed paths:
             D /branches/workbranch/addonsynctop.txt
             D /branches/workbranch/src/subdir1/subdir2/subdir3b/addonsync1.txt
             D /branches/workbranch/src/subdir1/subdir2/subdir3b/subdir3b-1
4. Moves/renames on sync branch
     a. Moved & renamed a file to the top level; renamed a file in a lower level, and
         moved & renamed a directory.
              i. Move file to top level and rename – Credit.java
             ii. Rename a file – NoLock.java
            iii. Move directory structure and rename – trans-am
     b. svn log reports:
           r8 | rjenkins | 2004-07-09 00:24:54 -0400 (Fri, 09 Jul 2004) | 1 line
           Changed paths:
             A /branches/workbranch/Credit.java (from
           /branches/workbranch/src/subdir1/subdir2/authenticate/CredentialsToken.java:7)
             D /branches/workbranch/src/subdir1/subdir2/authenticate/CredentialsToken.java
             A /branches/workbranch/src/subdir1/subdir2/subdir3/lock/NoLock.java (from
           /branches/workbranch/src/subdir1/subdir2/subdir3/lock/NodeLock.java:7)
             D /branches/workbranch/src/subdir1/subdir2/subdir3/lock/NodeLock.java
             D /branches/workbranch/src/subdir1/transaction
             A /branches/workbranch/trans-am (from /branches/workbranch/src/subdir1/transaction:7)
5. Adds on work branch, then merged to sync branch
      a. Added a file on the top level and then adding a directory structure within the
         current structure (includes directories and files).
              i. Added a top level file – workadd.java
             ii. Added a directory 3 levels down – subdirw3b
            iii. Added a file in that directory – workadd2.xml
            iv. Added a directory below that one – subdirw3b-1
             v. Added a directory below that one – subdirw3b-2
            vi. Added a file in that directory – workadd3.html
      b. svn log on work branch reports:
           r10 | rjenkins | 2004-07-09 00:47:20 -0400 (Fri, 09 Jul 2004) | 1 line
           Changed paths:
             A /branches/personalbranch/src/subdir1/subdir2/subdirw3b
             A /branches/personalbranch/src/subdir1/subdir2/subdirw3b/subdirw3b-1
             A /branches/personalbranch/src/subdir1/subdir2/subdirw3b/subdirw3b-1/subdirw3b-2
             A /branches/personalbranch/src/subdir1/subdir2/subdirw3b/subdirw3b-1/subdirw3b-
           2/workadd3.html
             A /branches/personalbranch/src/subdir1/subdir2/subdirw3b/workadd2.xml
             A /branches/personalbranch/workadd.java
       c. svn log on sync branch after merge reports:
           r11 | rjenkins | 2004-07-09 00:53:32 -0400 (Fri, 09 Jul 2004) | 1 line
           Changed paths:
             A /branches/workbranch/src/subdir1/subdir2/subdirw3b (from
           /branches/personalbranch/src/subdir1/subdir2/subdirw3b:10)
             R /branches/workbranch/src/subdir1/subdir2/subdirw3b/subdirw3b-1 (from
           /branches/personalbranch/src/subdir1/subdir2/subdirw3b/subdirw3b-1:10)
             R /branches/workbranch/src/subdir1/subdir2/subdirw3b/subdirw3b-1/subdirw3b-2
           (from /branches/personalbranch/src/subdir1/subdir2/subdirw3b/subdirw3b-1/subdirw3b-2:10)
             R /branches/workbranch/src/subdir1/subdir2/subdirw3b/subdirw3b-1/subdirw3b-2/
           workadd3.html (from /branches/personalbranch/src/subdir1/subdir2/subdirw3b/subdirw3b-
           1/subdirw3b-2/workadd3.html:10)
             R /branches/workbranch/src/subdir1/subdir2/subdirw3b/workadd2.xml (from
           /branches/personalbranch/src/subdir1/subdir2/subdirw3b/workadd2.xml:10)
             A /branches/workbranch/workadd.java (from /branches/personalbranch/workadd.java:10)
6. Modifications on work branch, then merged to sync branch
     a. Modifying a file on the top level and then files further within the structure.
               i. Modified top level file – workadd.java
              ii. Modified file 4 levels down – AuthenticateException.java
             iii. Modified file 5 levels down – LockImpl.java
     b. svn log on work branch reports:
           r12 | rjenkinsdomain | 2004-07-09 01:00:24 -0400 (Fri, 09 Jul 2004) | 1 line
           Changed paths:
             M /branches/personalbranch/src/subdir1/subdir2/authenticate/AuthenticateException.java
             M /branches/personalbranch/src/subdir1/subdir2/subdir3/lock/LockImpl.java
             M /branches/personalbranch/workadd.java
       c. svn log on sync branch after merge reports:
           r13 | rjenkinsdomain | 2004-07-09 01:03:24 -0400 (Fri, 09 Jul 2004) | 1 line
           Changed paths:
             M /branches/workbranch/src/subdir1/subdir2/authenticate/AuthenticateException.java
             M /branches/workbranch/src/subdir1/subdir2/subdir3/lock/LockImpl.java
             M /branches/workbranch/workadd.java
7. Deletions on work branch, then merged to sync branch
      a. Deleting a file on the top level, deleting a file in a lower level, and deleting a
          directory structure including a file.
               i. Deleted top level file – workadd.java
              ii. Deleted a file – package.html
             iii. Deleted a directory structure – subdirw3b-1 (included subdirw3b-2 and the
                  file workadd2.xml)
      b. svn log on work branch reports:
           r14 | rjenkinsdomain | 2004-07-09 01:07:55 -0400 (Fri, 09 Jul 2004) | 1 line
           Changed paths:
             D /branches/personalbranch/src/subdir1/subdir2/subdir3/lock/package.html
             D /branches/personalbranch/src/subdir1/subdir2/subdirw3b
             D /branches/personalbranch/workadd.java
       c. svn log on sync branch after merge reports:
           r15 | rjenkinsdomain | 2004-07-09 01:14:18 -0400 (Fri, 09 Jul 2004) | 1 line
           Changed paths:
             D /branches/workbranch/src/subdir1/subdir2/subdir3/lock/package.html
             D /branches/workbranch/src/subdir1/subdir2/subdirw3b
             D /branches/workbranch/workadd.java
8. Moves/renames on sync branch
     a. Moved & renamed a file to the top level; renamed a file in a lower level, and
         moved & renamed a directory.
              i. Move file to top level and rename – Nada.java
             ii. Rename a file – WhoAreYou.java
            iii. Move directory structure and rename – subdir3moved
       b. svn log on work branch reports:
           r16 | rjenkins | 2004-07-09 01:24:41 -0400 (Fri, 09 Jul 2004) | 1 line
           Changed paths:
             A /branches/personalbranch/Nada.java (from
           /branches/personalbranch/src/subdir1/subdir2/subdir3/lock/ObjectIsAlreadyLockedException.jav
           a:15)
             D /branches/personalbranch/src/subdir1/subdir2/authenticate/AuthenticateException.java
             A /branches/personalbranch/src/subdir1/subdir2/authenticate/WhoAreYou.java (from
           /branches/personalbranch/src/subdir1/subdir2/authenticate/AuthenticateException.java:15)
             D /branches/personalbranch/src/subdir1/subdir2/subdir3
             A /branches/personalbranch/src/subdir3moved (from
           /branches/personalbranch/src/subdir1/subdir2/subdir3:15)
             D /branches/personalbranch/src/subdir3moved/lock/ObjectIsAlreadyLockedException.java
       c. svn log on sync branch after merge reports:
           r17 | rjenkinsdomain | 2004-07-09 01:28:06 -0400 (Fri, 09 Jul 2004) | 1 line
           Changed paths:
             A /branches/workbranch/Nada.java (from /branches/personalbranch/Nada.java:16)
             D /branches/workbranch/src/subdir1/subdir2/authenticate/AuthenticateException.java
             A /branches/workbranch/src/subdir1/subdir2/authenticate/WhoAreYou.java (from
           /branches/personalbranch/src/subdir1/subdir2/authenticate/WhoAreYou.java:16)
             D /branches/workbranch/src/subdir1/subdir2/subdir3
             A /branches/workbranch/src/subdir3moved (from
           /branches/personalbranch/src/subdir3moved:16)
             R /branches/workbranch/src/subdir3moved/lock (from
           /branches/personalbranch/src/subdir3moved/lock:16)
             R /branches/workbranch/src/subdir3moved/lock/Lock.java (from
           /branches/personalbranch/src/subdir3moved/lock/Lock.java:16)
             R /branches/workbranch/src/subdir3moved/lock/LockException.java (from
           /branches/personalbranch/src/subdir3moved/lock/LockException.java:16)
             R /branches/workbranch/src/subdir3moved/lock/LockImpl.java (from
           /branches/personalbranch/src/subdir3moved/lock/LockImpl.java:16)
             R /branches/workbranch/src/subdir3moved/lock/LockTokenNotFoundException.java
           (from /branches/personalbranch/src/subdir3moved/lock/LockTokenNotFoundException.java:16)
             R /branches/workbranch/src/subdir3moved/lock/NoLock.java (from
           /branches/personalbranch/src/subdir3moved/lock/NoLock.java:16)
             R /branches/workbranch/src/subdir3moved/lock/ObjectLockedException.java (from
            /branches/personalbranch/src/subdir3moved/lock/ObjectLockedException.java:16)
9. Adds, modifications, deletes and moves/renames on work branch merged to sync branch
      a. Adding a file on the top level and then adding a directory structure within the
          current structure (includes directories and files); modifying a file on the top level
          and then files further within the structure; deleting a file on the top level, deleting
          a file in a lower level, and deleting a directory structure including a file moved &
          renamed a file to the top level; and renamed a file in a lower level, and moved &
          renamed a directory.
               i. Additions:
                       1. Added a top level file – mixtest1.java
                       2. Added a directory 3 levels down – mixsubdir1
                       3. Added a file in that directory – mixtest1.xml
                       4. Added a directory below that one – mixsubdir1-1
                       5. Added a directory below that one – mixsubdir1-2
                       6. Added a file in that directory – mixadd1.html
       ii. Modifications:
              1. Modified top level file – state.java
              2. Modified file 4 levels down – DefaultStore.java
              3. Modified file 5 levels down – DirectoryFilter.java
      iii. Deletions:
              1. Deleted top level file – MD5Encoder.java
              2. Deleted a file – MANIFEST.MF
              3. Deleted a directory structure – filechooser (included 2
                  subdirectories and several files)
      iv. Moves/renames:
              1. Move file to top level and rename – SPWDMeth.java
              2. Rename a file – DepartmentStore.java
              3. Move directory structure and rename – Utilities
b. svn log on work branch reports:
   r7 | rjenkins | 2004-07-15 16:17:56 -0400 (Thu, 15 Jul 2004) | 1 line
   Changed paths:
     D /branches/workbranch/MD5Encoder.java
     A /branches/workbranch/SPWDMeth.java (from
   /branches/workbranch/src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/methods/SPWeb
   davMethod.java:5)
     M /branches/workbranch/State.java
     A /branches/workbranch/Utilities (from /branches/workbranch/src/util:4)
     A /branches/workbranch/mixtest1.java
     A /branches/workbranch/src/contrib/webdavgui/mixsubdir1
     A /branches/workbranch/src/contrib/webdavgui/mixsubdir1/mixsubdir1-1
     A /branches/workbranch/src/contrib/webdavgui/mixsubdir1/mixsubdir1-1/mixsubdir1-2
     A /branches/workbranch/src/contrib/webdavgui/mixsubdir1/mixsubdir1-1/mixsubdir1-
   2/mixadd1.html
     A /branches/workbranch/src/contrib/webdavgui/mixsubdir1/mixtest1.xml
     D /branches/workbranch/src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser
     D
   /branches/workbranch/src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/methods/SPWeb
   davMethod.java
     D /branches/workbranch/src/etc/MANIFEST.MF
     A /branches/workbranch/src/stores/slidestore/mysql/DepartmentStore.java (from
    /branches/workbranch/src/stores/slidestore/mysql/MySQLDescriptorsStore.java:4)
     D /branches/workbranch/src/stores/slidestore/mysql/MySQLDescriptorsStore.java
     M /branches/workbranch/src/stores/slidestore/reference/DefaultStore.java
     M /branches/workbranch/src/stores/slidestore/reference/fileDeleter/DirectoryFilter.java
     D /branches/workbranch/src/util
c. log on sync branch after merge reports:
   r8 | rjenkins | 2004-07-15 16:24:06 -0400 (Thu, 15 Jul 2004) | 1 line
   Changed paths:
     D /branches/syncbranch/MD5Encoder.java
     A /branches/syncbranch/SPWDMeth.java (from /branches/workbranch/SPWDMeth.java:7)
     M /branches/syncbranch/State.java
     A /branches/syncbranch/Utilities (from /branches/workbranch/Utilities:7)
     R /branches/syncbranch/Utilities/org (from /branches/workbranch/Utilities/org:7)
     R /branches/syncbranch/Utilities/org/apache (from
   /branches/workbranch/Utilities/org/apache:7)
     R /branches/syncbranch/Utilities/org/apache/util (from
   /branches/workbranch/Utilities/org/apache/util:7)
  R /branches/syncbranch/Utilities/org/apache/util/Base64.java (from
/branches/workbranch/Utilities/org/apache/util/Base64.java:7)
  R /branches/syncbranch/Utilities/org/apache/util/DOMUtils.java (from
/branches/workbranch/Utilities/org/apache/util/DOMUtils.java:7)
  R /branches/syncbranch/Utilities/org/apache/util/DOMWriter.java (from
/branches/workbranch/Utilities/org/apache/util/DOMWriter.java:7)
  R /branches/syncbranch/Utilities/org/apache/util/GenericURI.java (from
/branches/workbranch/Utilities/org/apache/util/GenericURI.java:7)
  R /branches/syncbranch/Utilities/org/apache/util/HttpURL.java (from
/branches/workbranch/Utilities/org/apache/util/HttpURL.java:7)
  R /branches/syncbranch/Utilities/org/apache/util/MD5Encoder.java (from
/branches/workbranch/Utilities/org/apache/util/MD5Encoder.java:7)
  R /branches/syncbranch/Utilities/org/apache/util/MIME2Java.java (from
/branches/workbranch/Utilities/org/apache/util/MIME2Java.java:7)
  R /branches/syncbranch/Utilities/org/apache/util/NSDecl.java (from
/branches/workbranch/Utilities/org/apache/util/NSDecl.java:7)
  R /branches/syncbranch/Utilities/org/apache/util/NSStack.java (from
/branches/workbranch/Utilities/org/apache/util/NSStack.java:7)
  R /branches/syncbranch/Utilities/org/apache/util/PropertyWriter.java (from
/branches/workbranch/Utilities/org/apache/util/PropertyWriter.java:7)
  R /branches/syncbranch/Utilities/org/apache/util/QName.java (from
/branches/workbranch/Utilities/org/apache/util/QName.java:7)
  R /branches/syncbranch/Utilities/org/apache/util/URIUtil.java (from
/branches/workbranch/Utilities/org/apache/util/URIUtil.java:7)
  R /branches/syncbranch/Utilities/org/apache/util/URLUtil.java (from
/branches/workbranch/Utilities/org/apache/util/URLUtil.java:7)
  R /branches/syncbranch/Utilities/org/apache/util/WebdavStatus.java (from
/branches/workbranch/Utilities/org/apache/util/WebdavStatus.java:7)
  R /branches/syncbranch/Utilities/org/apache/util/XMLPrinter.java (from
/branches/workbranch/Utilities/org/apache/util/XMLPrinter.java:7)
  R /branches/syncbranch/Utilities/org/apache/util/XMLPrinter2.java (from
/branches/workbranch/Utilities/org/apache/util/XMLPrinter2.java:7)
  A /branches/syncbranch/mixtest1.java (from /branches/workbranch/mixtest1.java:7)
  A /branches/syncbranch/src/contrib/webdavgui/mixsubdir1 (from
/branches/workbranch/src/contrib/webdavgui/mixsubdir1:7)
  R /branches/syncbranch/src/contrib/webdavgui/mixsubdir1/mixsubdir1-1 (from
/branches/workbranch/src/contrib/webdavgui/mixsubdir1/mixsubdir1-1:7)
  R /branches/syncbranch/src/contrib/webdavgui/mixsubdir1/mixsubdir1-1/mixsubdir1-2 (from
/branches/workbranch/src/contrib/webdavgui/mixsubdir1/mixsubdir1-1/mixsubdir1-2:7)
  R /branches/syncbranch/src/contrib/webdavgui/mixsubdir1/mixsubdir1-1/mixsubdir1-
2/mixadd1.html (from /branches/workbranch/src/contrib/webdavgui/mixsubdir1/mixsubdir1-
1/mixsubdir1-2/mixadd1.html:7)
  R /branches/syncbranch/src/contrib/webdavgui/mixsubdir1/mixtest1.xml (from
/branches/workbranch/src/contrib/webdavgui/mixsubdir1/mixtest1.xml:7)
  D /branches/syncbranch/src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser
  D
/branches/syncbranch/src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/methods/SPWebd
avMethod.java
  D /branches/syncbranch/src/etc/MANIFEST.MF
  A /branches/syncbranch/src/stores/slidestore/mysql/DepartmentStore.java (from
/branches/workbranch/src/stores/slidestore/mysql/DepartmentStore.java:7)
  D /branches/syncbranch/src/stores/slidestore/mysql/MySQLDescriptorsStore.java
  M /branches/syncbranch/src/stores/slidestore/reference/DefaultStore.java
  M /branches/syncbranch/src/stores/slidestore/reference/fileDeleter/DirectoryFilter.java
  D /branches/syncbranch/src/util
10. Adds, modifications, deletes and moves/renames on work branch; committed in two sets
    (all those in the \src directory and blow; and all those in the top level directory and
    below); and merged on sync branch
         a. Adding a file on the top level and then adding a directory structure within the
            current structure (includes directories and files); modifying a file on the top level
            and then files further within the structure; deleting a file on the top level, deleting
            a file in a lower level, and deleting a directory structure; including a file moved &
            renamed a file to the top level; and renamed a file in a lower level, and moved &
            renamed a directory. Committing everything below a certain first level directory
            and then committing the rest from the top level directory.
                  i. First set of operations committed:
                         1. Additions:
                                  a. Added a top level file – mixtest1.java
                                  b. Added a directory 3 levels down – mixsubdir1
                                  c. Added a file in that directory – mixtest1.xml
                                  d. Added a directory below that one – mixsubdir1-1
                                  e. Added a directory below that one – mixsubdir1-2
                                  f. Added a file in that directory – mixadd1.html
                         2. Modifications:
                                  a. Modified top level file – state.java
                                  b. Modified file 4 levels down – DefaultStore.java
                                  c. Modified file 5 levels down – DirectoryFilter.java
                         3. Deletions:
                                  a. Deleted top level file – MD5Encoder.java
                                  b. Deleted a file – MANIFEST.MF
                                  c. Deleted a directory structure – filechooser (included 2
                                     subdirectories and several files)
                         4. Moves/renames:
                                  a. Move file to top level and rename – SPWDMeth.java
                                  b. Move directory structure and rename – Utilities
                 ii. Commits
                         1. From 1 level below top level – src
                         2. From top level
         b. svn log on work branch reports (revision 6 is from src commit and revision 7 from
            top level commit):
           r6 | rjenkins | 2004-07-20 01:22:15 -0400 (Tue, 20 Jul 2004) | 1 line
           Changed paths:
             A /branches/work/src/contrib/webdavgui/mixsubdir1
             A /branches/work/src/contrib/webdavgui/mixsubdir1/mixsubdir1-1
             A /branches/work/src/contrib/webdavgui/mixsubdir1/mixsubdir1-1/mixsubdir1-2
             A /branches/work/src/contrib/webdavgui/mixsubdir1/mixsubdir1-1/mixsubdir1-2/mixadd1.html
             A /branches/work/src/contrib/webdavgui/mixsubdir1/mixtest1.xml
             D /branches/work/src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser
             D
           /branches/work/src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/methods/SPWebdavMet
           hod.java
             D /branches/work/src/etc/MANIFEST.MF
             M /branches/work/src/stores/slidestore/reference/DefaultStore.java
     M /branches/work/src/stores/slidestore/reference/fileDeleter/DirectoryFilter.java
     D /branches/work/src/util
   r7 | rjenkins | 2004-07-20 01:23:26 -0400 (Tue, 20 Jul 2004) | 1 line
   Changed paths:
     D /branches/work/MD5Encoder.java
     A /branches/work/SPWDMeth.java (from
   /branches/work/src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/methods/SPWebdavMet
   hod.java:5)
     M /branches/work/State.java
     A /branches/work/Utilities (from /branches/work/src/util:5)
     A /branches/work/mixtest1.java
c. svn log on sync branch after merge reports:
   r8 | rjenkins | 2004-07-20 01:36:28 -0400 (Tue, 20 Jul 2004) | 1 line
   Changed paths:
     D /branches/integration/MD5Encoder.java
     A /branches/integration/SPWDMeth.java (from /branches/work/SPWDMeth.java:7)
     M /branches/integration/State.java
     A /branches/integration/Utilities (from /branches/work/Utilities:7)
     R /branches/integration/Utilities/org (from /branches/work/Utilities/org:7)
     R /branches/integration/Utilities/org/apache (from /branches/work/Utilities/org/apache:7)
     R /branches/integration/Utilities/org/apache/util (from
   /branches/work/Utilities/org/apache/util:7)
     R /branches/integration/Utilities/org/apache/util/Base64.java (from
   /branches/work/Utilities/org/apache/util/Base64.java:7)
     R /branches/integration/Utilities/org/apache/util/DOMUtils.java (from
   /branches/work/Utilities/org/apache/util/DOMUtils.java:7)
     R /branches/integration/Utilities/org/apache/util/DOMWriter.java (from
   /branches/work/Utilities/org/apache/util/DOMWriter.java:7)
     R /branches/integration/Utilities/org/apache/util/GenericURI.java (from
   /branches/work/Utilities/org/apache/util/GenericURI.java:7)
     R /branches/integration/Utilities/org/apache/util/HttpURL.java (from
   /branches/work/Utilities/org/apache/util/HttpURL.java:7)
     R /branches/integration/Utilities/org/apache/util/MD5Encoder.java (from
   /branches/work/Utilities/org/apache/util/MD5Encoder.java:7)
     R /branches/integration/Utilities/org/apache/util/MIME2Java.java (from
   /branches/work/Utilities/org/apache/util/MIME2Java.java:7)
     R /branches/integration/Utilities/org/apache/util/NSDecl.java (from
   /branches/work/Utilities/org/apache/util/NSDecl.java:7)
     R /branches/integration/Utilities/org/apache/util/NSStack.java (from
   /branches/work/Utilities/org/apache/util/NSStack.java:7)
     R /branches/integration/Utilities/org/apache/util/PropertyWriter.java (from
   /branches/work/Utilities/org/apache/util/PropertyWriter.java:7)
     R /branches/integration/Utilities/org/apache/util/QName.java (from
   /branches/work/Utilities/org/apache/util/QName.java:7)
     R /branches/integration/Utilities/org/apache/util/URIUtil.java (from
   /branches/work/Utilities/org/apache/util/URIUtil.java:7)
     R /branches/integration/Utilities/org/apache/util/URLUtil.java (from
   /branches/work/Utilities/org/apache/util/URLUtil.java:7)
     R /branches/integration/Utilities/org/apache/util/WebdavStatus.java (from
   /branches/work/Utilities/org/apache/util/WebdavStatus.java:7)
     R /branches/integration/Utilities/org/apache/util/XMLPrinter.java (from
   /branches/work/Utilities/org/apache/util/XMLPrinter.java:7)
     R /branches/integration/Utilities/org/apache/util/XMLPrinter2.java (from
   /branches/work/Utilities/org/apache/util/XMLPrinter2.java:7)
     A /branches/integration/mixtest1.java (from /branches/work/mixtest1.java:7)
             A /branches/integration/src/contrib/webdavgui/mixsubdir1 (from /branches/work
           /src/contrib/webdavgui/mixsubdir1:7)
             R /branches/integration/src/contrib/webdavgui/mixsubdir1/mixsubdir1-1 (from
           /branches/work/src/contrib/webdavgui/mixsubdir1/mixsubdir1-1:7)
             R /branches/integration/src/contrib/webdavgui/mixsubdir1/mixsubdir1-1/mixsubdir1-2 (from
           /branches/work/src/contrib/webdavgui/mixsubdir1/mixsubdir1-1/mixsubdir1-2:7)
             R /branches/integration/src/contrib/webdavgui/mixsubdir1/mixsubdir1-1/mixsubdir1-
           2/mixadd1.html (from /branches/work/src/contrib/webdavgui/mixsubdir1/mixsubdir1-
           1/mixsubdir1-2/mixadd1.html:7)
             R /branches/integration/src/contrib/webdavgui/mixsubdir1/mixtest1.xml (from
           /branches/work/src/contrib/webdavgui/mixsubdir1/mixtest1.xml:7)
             D /branches/integration/src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser
             D
           /branches/integration/src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/methods/SPWebd
           avMethod.java
             D /branches/integration/src/etc/MANIFEST.MF
             M /branches/integration/src/stores/slidestore/reference/DefaultStore.java
             M /branches/integration/src/stores/slidestore/reference/fileDeleter/DirectoryFilter.java
             D /branches/integration/src/util
11. Adds, modifications, deletes and moves/renames on work branch (committed); adds and
    modifications done on work branch (committed) and merged on sync branch
       a. Adding a file on the top level and then adding a directory structure within the
           current structure (includes directories and files); modifying a file on the top level
           and then files further within the structure; deleting a file on the top level, deleting
           a file in a lower level, and deleting a directory structure; including a file moved &
           renamed a file to the top level; and renamed a file in a lower level, and moved &
           renamed a directory. Commit these operations. Adding a file on the top level and
           then adding a directory structure within the current structure (includes directories
           and files); modifying a file on the top level and then doing more modifications to
           previously modified files further within the structure; deleting a file on the top
           level, deleting a file in a lower level, and deleting a directory structure. Commit
           these operations. Merge both to sync branch.
                i. First set of operations committed:
                        1. Additions:
                                a. Added a top level file – mixtest2.java
                                b. Added a directory 3 levels down – mixsubdir2
                                c. Added a file in that directory – mixtest2.xml
                                d. Added a directory below that one – mixsubdir2-1
                                e. Added a directory below that one – mixsubdir2-2
                                f. Added a file in that directory – mixadd2.html
                        2. Modifications:
                                a. Modified top level file – Cookie.java
                                b. Modified file 4 levels down – FileContentStore.java
                                c. Modified file 5 levels down – DeleterWalker.java
                        3. Deletions:
                                a. Deleted top level file – HttpMethodBase.java
                                b. Deleted a file – slide.properties
                                c. Deleted a directory structure – util (included 1file)
              4. Moves/renames:
                     a. Move file to top level and rename – MakeStrong.java
                     b. Rename a file – DepartmentStore.java
                     c. Move directory structure and rename – MasterPlan
      ii. Second set of operations committed (both then merged):
              1. Additions:
                     a. Added a top level file – mixtest2b.java
                     b. Added a directory 3 levels down – mixsubdir2b
                     c. Added a file in that directory – mixtest2b.xml
                     d. Added a directory below that one – mixsubdir2b-1
                     e. Added a directory below that one – mixsubdir2b-2
                     f. Added a file in that directory – mixadd2b.html
              2. Modifications:
                     a. Modified top level file – Base64.java
                     b. Modified file modified in previous step – DefaultStore.java
                     c. Modified file modified in previous step –
                         DirectoryFilter.java
              3. Deletions:
                     a. Deleted top level file – URIUtil.java
                     b. Deleted a file – Domain.sample
                     c. Deleted a directory structure – stylesheets (included 2 files)
b. svn log on work branch reports:
   r9 | rjenkins | 2004-07-20 02:04:01 -0400 (Tue, 20 Jul 2004) | 1 line
   Changed paths:
     M /branches/work/Cookie.java
     D /branches/work/HttpMethodBase.java
     A /branches/work/MakeStrong.java (from
   /branches/work/src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/methods/SPMkcolMeth
   od.java:8)
     A /branches/work/MasterPlan (from /branches/work/src/schema:8)
     A /branches/work/mixtest2.java
     A /branches/work/src/contrib/webdavgui/mixsubdir2
     A /branches/work/src/contrib/webdavgui/mixsubdir2/mixsubdir2-1
     A /branches/work/src/contrib/webdavgui/mixsubdir2/mixsubdir2-1/mixsubdir2-2
     A /branches/work/src/contrib/webdavgui/mixsubdir2/mixsubdir2-1/mixsubdir2-2/mixadd2.html
     A /branches/work/src/contrib/webdavgui/mixsubdir2/mixtest2.xml
     D
   /branches/work/src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/methods/SPMkcolMeth
   od.java
     D /branches/work/src/contrib/webdavgui/src/java/org/apache/webdav/ui/util
     D /branches/work/src/etc/slide.properties
     D /branches/work/src/schema
     A /branches/work/src/stores/slidestore/mysql/DepartmentStore.java (from
   /branches/work/src/stores/slidestore/mysql/MySQLDescriptorsStore.java:8)
     D /branches/work/src/stores/slidestore/mysql/MySQLDescriptorsStore.java
     M /branches/work/src/stores/slidestore/reference/FileContentStore.java
     M /branches/work/src/stores/slidestore/reference/fileDeleter/DeleterWalker.java
   r10 | rjenkins | 2004-07-20 02:17:51 -0400 (Tue, 20 Jul 2004) | 1 line
   Changed paths:
     M /branches/work/Base64.java
     D /branches/work/URIUtil.java
     A /branches/work/mixtest2b.java
     A /branches/work/src/contrib/webdavgui/mixsubdir2b
     A /branches/work/src/contrib/webdavgui/mixsubdir2b/mixsubdir2b-1
     A /branches/work/src/contrib/webdavgui/mixsubdir2b/mixsubdir2b-1/mixsubdir2b-2
     A /branches/work/src/contrib/webdavgui/mixsubdir2b/mixsubdir2b-1/mixsubdir2b-
   2/mixadd2b.html
     A /branches/work/src/contrib/webdavgui/mixsubdir2b/mixtest2b.xml
     D /branches/work/src/doc/samples/Domain.sample
     D /branches/work/src/doc/stylesheets
     M /branches/work/src/stores/slidestore/reference/fileDeleter/DeleterWalker.java
c. svn log on sync branch after merge reports:
   r11 | rjenkins | 2004-07-20 02:23:36 -0400 (Tue, 20 Jul 2004) | 1 line
   Changed paths:
     M /branches/integration/Base64.java
     M /branches/integration/Cookie.java
     D /branches/integration/HttpMethodBase.java
     A /branches/integration/MakeStrong.java (from /branches/work/MakeStrong.java:10)
     A /branches/integration/MasterPlan (from /branches/work/MasterPlan:10)
     R /branches/integration/MasterPlan/webdav.dtd (from
   /branches/work/MasterPlan/webdav.dtd:10)
     R /branches/integration/MasterPlan/webdav.xsd (from
   /branches/work/MasterPlan/webdav.xsd:10)
     D /branches/integration/URIUtil.java
     A /branches/integration/mixtest2.java (from /branches/work/mixtest2.java:10)
     A /branches/integration/mixtest2b.java (from /branches/work/mixtest2b.java:10)
     A /branches/integration/src/contrib/webdavgui/mixsubdir2 (from /branches/work
   /src/contrib/webdavgui/mixsubdir2:10)
     R /branches/integration/src/contrib/webdavgui/mixsubdir2/mixsubdir2-1 (from
   /branches/work/src/contrib/webdavgui/mixsubdir2/mixsubdir2-1:10)
     R /branches/integration/src/contrib/webdavgui/mixsubdir2/mixsubdir2-1/mixsubdir2-2 (from
   /branches/work/src/contrib/webdavgui/mixsubdir2/mixsubdir2-1/mixsubdir2-2:10)
     R /branches/integration/src/contrib/webdavgui/mixsubdir2/mixsubdir2-1/mixsubdir2-
   2/mixadd2.html (from /branches/work/src/contrib/webdavgui/mixsubdir2/mixsubdir2-
   1/mixsubdir2-2/mixadd2.html:10)
     R /branches/integration/src/contrib/webdavgui/mixsubdir2/mixtest2.xml (from
   /branches/work/src/contrib/webdavgui/mixsubdir2/mixtest2.xml:10)
     A /branches/integration/src/contrib/webdavgui/mixsubdir2b (from
   /branches/work/src/contrib/webdavgui/mixsubdir2b:10)
     R /branches/integration/src/contrib/webdavgui/mixsubdir2b/mixsubdir2b-1 (from
    /branches/work/src/contrib/webdavgui/mixsubdir2b/mixsubdir2b-1:10)
     R /branches/integration/src/contrib/webdavgui/mixsubdir2b/mixsubdir2b-1/mixsubdir2b-2 (from
   /branches/work/src/contrib/webdavgui/mixsubdir2b/mixsubdir2b-1/mixsubdir2b-2:10)
     R /branches/integration/src/contrib/webdavgui/mixsubdir2b/mixsubdir2b-1/mixsubdir2b-
   2/mixadd2b.html (from /branches/work/src/contrib/webdavgui/mixsubdir2b/mixsubdir2b-
   1/mixsubdir2b-2/mixadd2b.html:10)
     R /branches/integration/src/contrib/webdavgui/mixsubdir2b/mixtest2b.xml (from
    /branches/work/src/contrib/webdavgui/mixsubdir2b/mixtest2b.xml:10)
     D
   /branches/integration/src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/methods/SPMkcol
   Method.java
     D /branches/integration/src/contrib/webdavgui/src/java/org/apache/webdav/ui/util
     D /branches/integration/src/doc/samples/Domain.sample
     D /branches/integration/src/doc/stylesheets
     D /branches/integration/src/etc/slide.properties
     D /branches/integration/src/schema
             A /branches/integration/src/stores/slidestore/mysql/DepartmentStore.java (from
           /branches/work/src/stores/slidestore/mysql/DepartmentStore.java:10)
             D /branches/integration/src/stores/slidestore/mysql/MySQLDescriptorsStore.java
             M /branches/integration/src/stores/slidestore/reference/FileContentStore.java
             M /branches/integration/src/stores/slidestore/reference/fileDeleter/DeleterWalker.java
12. Adds, modifications, deletes and moves/renames on sync branch
       a. Adding a file on the top level and then adding a directory structure within the
           current structure (includes directories and files); modifying a file on the top level
           and then files further within the structure; deleting a file on the top level, deleting
           a file in a lower level, and deleting a directory structure; including a file moved &
           renamed a file to the top level; and renamed a file in a lower level, and moved &
           renamed a directory. Commit these operations. Adding a file on the top level and
           then adding a directory structure within the current structure (includes directories
           and files); modifying a file on the top level and then doing more modifications to
           previously modified files further within the structure; deleting a file on the top
           level, deleting a file in a lower level, and deleting a directory structure; and
           moving a file to the top level & renaming it, renaming a file that was renamed in
           the previous commit, rename a moved & renamed directory from the previous
           commit, and moving & renaming a directory. Commit these operations first from
           the first level directory and then from the top level directory. Merge all three
           commits to the sync branch.
                i. First set of operations committed:
                        1. Additions:
                                a. Added a top level file – mixtest3.java
                                b. Added a directory 3 levels down – mixsubdir3
                                c. Added a file in that directory – mixtest3.xml
                                d. Added a directory below that one – mixsubdir3-1
                                e. Added a directory below that one – mixsubdir3-2
                                f. Added a file in that directory – mixadd3.html
                        2. Modifications:
                                a. Modified top level file – PostMethod.java
                                b. Modified file 4 levels down –
                                    MemoryDescriptorsStore.java
                                c. Modified file 5 levels down – DirectoryFilter.java
                        3. Deletions:
                                a. Deleted top level file – OptionsMethod.java
                                b. Deleted a file – slide-struts.tld
                                c. Deleted a directory structure – oracle (included 1file)
                        4. Moves/renames:
                                a. Move file to top level and rename – Quilting.java
                                b. Rename a file – MoneyLost.java
                                c. Move directory structure and rename (via copy and delete)
                                    – UFO
      ii. Second set of operations committed (both then merged):
              1. Additions:
                     a. Added a top level file – mixtest3b.java
                     b. Added a directory 3 levels down – mixsubdir3b
                     c. Added a file in that directory – mixtest3b.xml
                     d. Added a directory below that one – mixsubdir3b-1
                     e. Added a directory below that one – mixsubdir3b-2
                     f. Added a file in that directory – mixadd3b.html
              2. Modifications:
                     a. Modified top level file – Base64.java
                     b. Modified file modified in previous step –
                         MemoryDescriptorsStore.java
                     c. Modified file modified in previous step – PostMethod.java
              3. Deletions:
                     a. Deleted top level file – ConnectionInterceptor.java
                     b. Deleted a file – NSDecl.java
                     c. Deleted a directory structure – mixsubdir1 (included 2
                         subdirectories and 2 files)
              4. Moves/renames:
                     a. Move file to top level and rename – Dominique.java
                     b. Rename a file that was renamed earlier –
                         MoneyMisplaced.java
                     c. Rename a moved and renamed directory – USO
                     d. Move and rename a directory (via copy and delete) -
                         documents
b. svn log on work branch reports:
   r12 | rjenkins | 2004-07-20 02:55:08 -0400 (Tue, 20 Jul 2004) | 1 line
   Changed paths:
     D /branches/work/OptionsMethod.java
     M /branches/work/PostMethod.java
     A /branches/work/Quilting.java (from /branches/work/src/contrib/webdavgui/src
   /java/org/apache/webdav/ui/lib/methods/SPPropPatchMethod.java:11)
     D /branches/work/Utilities
     A /branches/work/mixtest3.java
     D /branches/work/src/contrib/taglib/slide-struts.tld
     A /branches/work/src/contrib/webdavgui/mixsubdir3
     A /branches/work/src/contrib/webdavgui/mixsubdir3/mixsubdir3-1
     A /branches/work/src/contrib/webdavgui/mixsubdir3/mixsubdir3-1/mixsubdir3-2
     A /branches/work/src/contrib/webdavgui/mixsubdir3/mixsubdir3-1/mixsubdir3-2/mixadd3.html
     A /branches/work/src/contrib/webdavgui/mixsubdir3/mixtest3.xml
     D
   /branches/work/src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/methods/SPPropPatch
   Method.java
     A /branches/work/src/etc/UFO (from /branches/work/Utilities:11)
     A /branches/work/src/stores/slidestore/mysql/MoneyLost.java (from
   /branches/work/src/stores/slidestore/mysql/MySQLContentStore.java:11)
     D /branches/work/src/stores/slidestore/mysql/MySQLContentStore.java
     D /branches/work/src/stores/slidestore/oracle
     M /branches/work/src/stores/slidestore/reference/MemoryDescriptorsStore.java
     M /branches/work/src/stores/slidestore/reference/fileDeleter/DirectoryFilter.java
   r13 | rjenkins | 2004-07-20 03:12:09 -0400 (Tue, 20 Jul 2004) | 1 line
   Changed paths:
     A /branches/work/src/contrib/documents (from /branches/work/src/doc:12)
     D /branches/work/src/contrib/webdavgui/mixsubdir1
     A /branches/work/src/contrib/webdavgui/mixsubdir3b
     A /branches/work/src/contrib/webdavgui/mixsubdir3b/mixsubdir3b-1
     A /branches/work/src/contrib/webdavgui/mixsubdir3b/mixsubdir3b-1/mixsubdir3b-2
     A /branches/work/src/contrib/webdavgui/mixsubdir3b/mixsubdir3b-1/mixsubdir3b-
   2/mixtest3.html
     A /branches/work/src/contrib/webdavgui/mixsubdir3b/mixtest3b.xml
     D /branches/work/src/doc
     D /branches/work/src/etc/UFO
     A /branches/work/src/etc/USO (from /branches/work/src/etc/UFO:12)
     D /branches/work/src/etc/USO/org/apache/util/DOMWriter.java
     D /branches/work/src/etc/USO/org/apache/util/NSDecl.java
     D /branches/work/src/stores/slidestore/mysql/MoneyLost.java
     A /branches/work/src/stores/slidestore/mysql/MoneyMisplaced.java (from
   /branches/work/src/stores/slidestore/mysql/MoneyLost.java:12)
     M /branches/work/src/stores/slidestore/reference/MemoryDescriptorsStore.java
   r14 | rjenkins | 2004-07-20 03:18:01 -0400 (Tue, 20 Jul 2004) | 1 line
   Changed paths:
     M /branches/work/Base64.java
     D /branches/work/ConnectionInterceptor.java
     A /branches/work/Dominique.java (from
   /branches/work/src/etc/UFO/org/apache/util/DOMWriter.java:12)
     M /branches/work/PostMethod.java
     A /branches/work/mixtest3b.java
c. svn log on sync branch after merge reports:
   r15 | rjenkins | 2004-07-20 03:22:32 -0400 (Tue, 20 Jul 2004) | 1 line
   Changed paths:
     M /branches/integration/Base64.java
     D /branches/integration/ConnectionInterceptor.java
     A /branches/integration/Dominique.java (from /branches/work/Dominique.java:14)
     D /branches/integration/OptionsMethod.java
     M /branches/integration/PostMethod.java
     A /branches/integration/Quilting.java (from /branches/work/Quilting.java:14)
     D /branches/integration/Utilities
     A /branches/integration/mixtest3.java (from /branches/work/mixtest3.java:14)
     A /branches/integration/mixtest3b.java (from /branches/work/mixtest3b.java:14)
     A /branches/integration/src/contrib/documents (from /branches/work/src/contrib/documents:14)
     R /branches/integration/src/contrib/documents/architecture.xml (from
   /branches/work/src/contrib/documents/architecture.xml:14)
     R /branches/integration/src/contrib/documents/changelog.xml (from
   /branches/work/src/contrib/documents/changelog.xml:14)
     R /branches/integration/src/contrib/documents/conf-lib.xml (from
   /branches/work/src/contrib/documents/conf-lib.xml:14)
     R /branches/integration/src/contrib/documents/contrib.xml (from
   /branches/work/src/contrib/documents/contrib.xml:14)
     R /branches/integration/src/contrib/documents/domain.xml (from
   /branches/work/src/contrib/documents/domain.xml:14)
     R /branches/integration/src/contrib/documents/examples.xml (from
   /branches/work/src/contrib/documents/examples.xml:14)
     R /branches/integration/src/contrib/documents/howto-jdbcstore.xml (from
   /branches/work/src/contrib/documents/howto-jdbcstore.xml:14)
  R /branches/integration/src/contrib/documents/howto-tomcat.xml (from
/branches/work/src/contrib/documents/howto-tomcat.xml:14)
  R /branches/integration/src/contrib/documents/images (from
/branches/work/src/contrib/documents/images:14)
  R /branches/integration/src/contrib/documents/images/Slide.gif (from
/branches/work/src/contrib/documents/images/Slide.gif:14)
  R /branches/integration/src/contrib/documents/images/Slide.xcf (from
/branches/work/src/contrib/documents/images/Slide.xcf:14)
  R /branches/integration/src/contrib/documents/images/Thumbs.db (from
/branches/work/src/contrib/documents/images/Thumbs.db:14)
  R /branches/integration/src/contrib/documents/images/add.gif (from
/branches/work/src/contrib/documents/images/add.gif:14)
  R /branches/integration/src/contrib/documents/images/arch-ext.png (from
/branches/work/src/contrib/documents/images/arch-ext.png:14)
  R /branches/integration/src/contrib/documents/images/arch-int1.png (from
/branches/work/src/contrib/documents/images/arch-int1.png:14)
  R /branches/integration/src/contrib/documents/images/arch-int2.png (from
/branches/work/src/contrib/documents/images/arch-int2.png:14)
  R /branches/integration/src/contrib/documents/images/code.gif (from
/branches/work/src/contrib/documents/images/code.gif:14)
  R /branches/integration/src/contrib/documents/images/design.gif (from
/branches/work/src/contrib/documents/images/design.gif:14)
  R /branches/integration/src/contrib/documents/images/docs.gif (from
/branches/work/src/contrib/documents/images/docs.gif:14)
  R /branches/integration/src/contrib/documents/images/fix.gif (from
/branches/work/src/contrib/documents/images/fix.gif:14)
  R /branches/integration/src/contrib/documents/images/jakarta-logo.gif (from
/branches/work/src/contrib/documents/images/jakarta-logo.gif:14)
  R /branches/integration/src/contrib/documents/images/ns1.png (from
/branches/work/src/contrib/documents/images/ns1.png:14)
  R /branches/integration/src/contrib/documents/images/ns2.png (from
/branches/work/src/contrib/documents/images/ns2.png:14)
  R /branches/integration/src/contrib/documents/images/tomcat-power.gif (from
/branches/work/src/contrib/documents/images/tomcat-power.gif:14)
  R /branches/integration/src/contrib/documents/images/update.gif (from
/branches/work/src/contrib/documents/images/update.gif:14)
  R /branches/integration/src/contrib/documents/index.xml (from
/branches/work/src/contrib/documents/index.xml:14)
  R /branches/integration/src/contrib/documents/installation.xml (from
/branches/work/src/contrib/documents/installation.xml:14)
  R /branches/integration/src/contrib/documents/library.xml (from
/branches/work/src/contrib/documents/library.xml:14)
  R /branches/integration/src/contrib/documents/lock.xml (from
/branches/work/src/contrib/documents/lock.xml:14)
  R /branches/integration/src/contrib/documents/macro.xml (from
/branches/work/src/contrib/documents/macro.xml:14)
  R /branches/integration/src/contrib/documents/namespace.xml (from
/branches/work/src/contrib/documents/namespace.xml:14)
  R /branches/integration/src/contrib/documents/news.xml (from
/branches/work/src/contrib/documents/news.xml:14)
  R /branches/integration/src/contrib/documents/process.xml (from
/branches/work/src/contrib/documents/process.xml:14)
  R /branches/integration/src/contrib/documents/release.xml (from
/branches/work/src/contrib/documents/release.xml:14)
  R /branches/integration/src/contrib/documents/samples (from
/branches/work/src/contrib/documents/samples:14)
  R /branches/integration/src/contrib/documents/search.xml (from
/branches/work/src/contrib/documents/search.xml:14)
  R /branches/integration/src/contrib/documents/security.xml (from
/branches/work/src/contrib/documents/security.xml:14)
  R /branches/integration/src/contrib/documents/server.xml (from
/branches/work/src/contrib/documents/server.xml:14)
  R /branches/integration/src/contrib/documents/status.xml (from
/branches/work/src/contrib/documents/status.xml:14)
  R /branches/integration/src/contrib/documents/structure.xml (from
/branches/work/src/contrib/documents/structure.xml:14)
  R /branches/integration/src/contrib/documents/struts-taglib.xml (from
/branches/work/src/contrib/documents/struts-taglib.xml:14)
  R /branches/integration/src/contrib/documents/version.xml (from
/branches/work/src/contrib/documents/version.xml:14)
  R /branches/integration/src/contrib/documents/webdav-client.xml (from
/branches/work/src/contrib/documents/webdav-client.xml:14)
  D /branches/integration/src/contrib/taglib/slide-struts.tld
  D /branches/integration/src/contrib/webdavgui/mixsubdir1
  A /branches/integration/src/contrib/webdavgui/mixsubdir3 (from
/branches/work/src/contrib/webdavgui/mixsubdir3:14)
  R /branches/integration/src/contrib/webdavgui/mixsubdir3/mixsubdir3-1 (from
/branches/work/src/contrib/webdavgui/mixsubdir3/mixsubdir3-1:14)
  R /branches/integration/src/contrib/webdavgui/mixsubdir3/mixsubdir3-1/mixsubdir3-2 (from
/branches/work/src/contrib/webdavgui/mixsubdir3/mixsubdir3-1/mixsubdir3-2:14)
  R /branches/integration/src/contrib/webdavgui/mixsubdir3/mixsubdir3-1/mixsubdir3-
2/mixadd3.html (from /branches/work/src/contrib/webdavgui/mixsubdir3/mixsubdir3-
1/mixsubdir3-2/mixadd3.html:14)
  R /branches/integration/src/contrib/webdavgui/mixsubdir3/mixtest3.xml (from
/branches/work/src/contrib/webdavgui/mixsubdir3/mixtest3.xml:14)
  A /branches/integration/src/contrib/webdavgui/mixsubdir3b (from
/branches/work/src/contrib/webdavgui/mixsubdir3b:14)
  R /branches/integration/src/contrib/webdavgui/mixsubdir3b/mixsubdir3b-1 (from
 /branches/work/src/contrib/webdavgui/mixsubdir3b/mixsubdir3b-1:14)
  R /branches/integration/src/contrib/webdavgui/mixsubdir3b/mixsubdir3b-1/mixsubdir3b-2 (from
/branches/work/src/contrib/webdavgui/mixsubdir3b/mixsubdir3b-1/mixsubdir3b-2:14)
  R /branches/integration/src/contrib/webdavgui/mixsubdir3b/mixsubdir3b-1/mixsubdir3b-
2/mixtest3.html (from /branches/work/src/contrib/webdavgui/mixsubdir3b/mixsubdir3b-
1/mixsubdir3b-2/mixtest3.html:14)
  R /branches/integration/src/contrib/webdavgui/mixsubdir3b/mixtest3b.xml (from
 /branches/work/src/contrib/webdavgui/mixsubdir3b/mixtest3b.xml:14)
  D
/branches/integration/src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/methods/SPProp
PatchMethod.java
  D /branches/integration/src/doc
  A /branches/integration/src/etc/USO (from /branches/work/src/etc/USO:14)
  R /branches/integration/src/etc/USO/org (from /branches/work/src/etc/USO/org:14)
  R /branches/integration/src/etc/USO/org/apache (from
/branches/work/src/etc/USO/org/apache:14)
  R /branches/integration/src/etc/USO/org/apache/util (from
/branches/work/src/etc/USO/org/apache/util:14)
  R /branches/integration/src/etc/USO/org/apache/util/Base64.java (from
/branches/work/src/etc/USO/org/apache/util/Base64.java:14)
  R /branches/integration/src/etc/USO/org/apache/util/DOMUtils.java (from
/branches/work/src/etc/USO/org/apache/util/DOMUtils.java:14)
  R /branches/integration/src/etc/USO/org/apache/util/GenericURI.java (from
/branches/work/src/etc/USO/org/apache/util/GenericURI.java:14)
              R /branches/integration/src/etc/USO/org/apache/util/HttpURL.java (from
            /branches/work/src/etc/USO/org/apache/util/HttpURL.java:14)
              R /branches/integration/src/etc/USO/org/apache/util/MD5Encoder.java (from
            /branches/work/src/etc/USO/org/apache/util/MD5Encoder.java:14)
              R /branches/integration/src/etc/USO/org/apache/util/MIME2Java.java (from
            /branches/work/src/etc/USO/org/apache/util/MIME2Java.java:14)
              R /branches/integration/src/etc/USO/org/apache/util/NSStack.java (from
            /branches/work/src/etc/USO/org/apache/util/NSStack.java:14)
              R /branches/integration/src/etc/USO/org/apache/util/PropertyWriter.java (from
             /branches/work/src/etc/USO/org/apache/util/PropertyWriter.java:14)
              R /branches/integration/src/etc/USO/org/apache/util/QName.java (from
            /branches/work/src/etc/USO/org/apache/util/QName.java:14)
              R /branches/integration/src/etc/USO/org/apache/util/URIUtil.java (from
            /branches/work/src/etc/USO/org/apache/util/URIUtil.java:14)
              R /branches/integration/src/etc/USO/org/apache/util/URLUtil.java (from
            /branches/work/src/etc/USO/org/apache/util/URLUtil.java:14)
              R /branches/integration/src/etc/USO/org/apache/util/WebdavStatus.java (from
            /branches/work/src/etc/USO/org/apache/util/WebdavStatus.java:14)
              R /branches/integration/src/etc/USO/org/apache/util/XMLPrinter.java (from
            /branches/work/src/etc/USO/org/apache/util/XMLPrinter.java:14)
              R /branches/integration/src/etc/USO/org/apache/util/XMLPrinter2.java (from
            /branches/work/src/etc/USO/org/apache/util/XMLPrinter2.java:14)
              A /branches/integration/src/stores/slidestore/mysql/MoneyMisplaced.java (from
             /branches/work/src/stores/slidestore/mysql/MoneyMisplaced.java:14)
              D /branches/integration/src/stores/slidestore/mysql/MySQLContentStore.java
              D /branches/integration/src/stores/slidestore/oracle
              M /branches/integration/src/stores/slidestore/reference/MemoryDescriptorsStore.java
              M /branches/integration/src/stores/slidestore/reference/fileDeleter/DirectoryFilter.java

13. Sander’s bug
Create folders at 3 levels and add files. Move the file from third level directory to the second
level and commit. Move the 3rd level directory to the first level and commit.

svn log on work branch reports:
r2 | rajeswari | 2004-12-02 19:55:29 +0530 (Thu, 02 Dec 2004) | 1 line
Changed paths:
  A /trunk/www/subdir1
  A /trunk/www/subdir1/Base6.java
  A /trunk/www/subdir1/subdir2
  A /trunk/www/subdir1/subdir2/Code.java
  A /trunk/www/subdir1/subdir2/subdir3
  A /trunk/www/subdir1/subdir2/subdir3/CodeImp.java
r3 | rajeswari | 2004-12-02 19:57:30 +0530 (Thu, 02 Dec 2004) | 1 line
Changed paths:
  A /trunk/www/subdir1/subdir2/CodeImp.java (from /trunk/www/subdir1/subdir2/su
bdir3/CodeImp.java:2)
  D /trunk/www/subdir1/subdir2/subdir3
  A /trunk/www/subdir1/subdir3 (from /trunk/www/subdir1/subdir2/subdir3:2)
  D /trunk/www/subdir1/subdir3/CodeImp.java

								
To top