Hi
I found that "xdocs/Sensis_Classifieds_J2EE_Framework.doc" on my branch
was corrupted.
Since I had changed the Meta data on this file on the branch I wanted to
merge it back to the trunk (Don't worry JUST testing).
In step 0 I listed the file.
In step 1 I ran a dry-run.
In step 2 I ran the merge.
In step 3 I listed the file.
In step 4 I commit the file to trunk
In step 5 I listed the file again.
The strange behaviour is that the file size changed between step 3 and
step 5 and that file is now corrupted.
Why did the file size change after a commit. I would have expected it to
change after the merge...!!
Can anyone please shed some light on this problem. Thanking you in
advance.
STEP 0
------
lakshman@bart:~ > ll Common-trunk/xdocs/
total 760
-rw-r--r-- 1 lakshman dev 596992 Feb 3 18:13
Sensis_Classifieds_J2EE_Framework.doc
-rw-r--r-- 1 lakshman dev 171520 Feb 3 18:13
Sensis_Classifieds_Logging.doc
STEP 1
------
lakshman@bart:~/Common-trunk > svn merge -r59:62
svn://lakshman@bart/Enterprise/Common/branches/dev --dry-run
U xdocs/Sensis_Classifieds_J2EE_Framework.doc
U xdocs/Sensis_Classifieds_Logging.doc
UU project.xml
UU src/test/au/com/sc/logging/LoggingTest.java
UU src/test/au/com/sc/logging/EventClickThrough.java
UU src/test/au/com/sc/common/UtilsTest.java
UU src/test/au/com/sc/common/SCConstantsTest.java
UU src/test/au/com/sc/common/PropertyLoaderTest.java
U src/test/log4j.dtd
U src/test/log4j.xml
UU src/java/au/com/sc/logging/EnterpriseLogger.java
UU src/java/au/com/sc/logging/DumpXML.java
UU src/java/au/com/sc/logging/EnterpriseLevel.java
UU src/java/au/com/sc/logging/JMSAppender.java
UU src/java/au/com/sc/common/Utils.java
UU src/java/au/com/sc/common/SCConstants.java
UU src/java/au/com/sc/common/PropertyLoader.java
UU src/conf/sc.properties
UU src/conf/au/com/test1.xml
UU src/conf/au/com/test2.xml
UU src/conf/au/com/test1.properties
U bin/CreateASDomain
U bin/CreateASInstance
UU build.properties
STEP 2
------
lakshman@bart:~/Common-trunk > svn merge -r59:62
svn://lakshman@bart/Enterprise/Common/branches/dev
U xdocs/Sensis_Classifieds_J2EE_Framework.doc
U xdocs/Sensis_Classifieds_Logging.doc
UU project.xml
UU src/test/au/com/sc/logging/LoggingTest.java
UU src/test/au/com/sc/logging/EventClickThrough.java
UU src/test/au/com/sc/common/UtilsTest.java
UU src/test/au/com/sc/common/SCConstantsTest.java
UU src/test/au/com/sc/common/PropertyLoaderTest.java
U src/test/log4j.dtd
U src/test/log4j.xml
UU src/java/au/com/sc/logging/EnterpriseLogger.java
UU src/java/au/com/sc/logging/DumpXML.java
UU src/java/au/com/sc/logging/EnterpriseLevel.java
UU src/java/au/com/sc/logging/JMSAppender.java
UU src/java/au/com/sc/common/Utils.java
UU src/java/au/com/sc/common/SCConstants.java
UU src/java/au/com/sc/common/PropertyLoader.java
UU src/conf/sc.properties
UU src/conf/au/com/test1.xml
UU src/conf/au/com/test2.xml
UU src/conf/au/com/test1.properties
U bin/CreateASDomain
U bin/CreateASInstance
UU build.properties
STEP 3
------
lakshman@bart:~/Common-trunk > ll xdocs/
total 1348
-rw-r--r-- 1 lakshman dev 596992 Feb 3 18:13
Sensis_Classifieds_J2EE_Framework.doc
-rw-r--r-- 1 lakshman dev 596992 Feb 3 18:34
Sensis_Classifieds_J2EE_Framework.doc.good
-rw-r--r-- 1 lakshman dev 171520 Feb 3 18:13
Sensis_Classifieds_Logging.doc
STEP 4
------
lakshman@bart:~/Common-trunk > svn commit
Sending bin/CreateASDomain
Sending bin/CreateASInstance
Sending build.properties
Sending project.xml
Sending src/conf/au/com/test1.properties
Sending src/conf/au/com/test1.xml
Sending src/conf/au/com/test2.xml
Sending src/conf/sc.properties
Sending src/java/au/com/sc/common/PropertyLoader.java
Sending src/java/au/com/sc/common/SCConstants.java
Sending src/java/au/com/sc/common/Utils.java
Sending src/java/au/com/sc/logging/DumpXML.java
Sending src/java/au/com/sc/logging/EnterpriseLevel.java
Sending src/java/au/com/sc/logging/EnterpriseLogger.java
Sending src/java/au/com/sc/logging/JMSAppender.java
Sending src/test/au/com/sc/common/PropertyLoaderTest.java
Sending src/test/au/com/sc/common/SCConstantsTest.java
Sending src/test/au/com/sc/common/UtilsTest.java
Sending src/test/au/com/sc/logging/EventClickThrough.java
Sending src/test/au/com/sc/logging/LoggingTest.java
Sending src/test/log4j.dtd
Sending src/test/log4j.xml
Sending xdocs/Sensis_Classifieds_J2EE_Framework.doc
Sending xdocs/Sensis_Classifieds_Logging.doc
Transmitting file data ..................
Committed revision 63.
lakshman@bart:~/Common-trunk >
STEP 5
------
lakshman@bart:~/Common-trunk > ll xdocs/
total 1348
-rw-r--r-- 1 lakshman dev 597008 Feb 3 18:44
Sensis_Classifieds_J2EE_Framework.doc
-rw-r--r-- 1 lakshman dev 596992 Feb 3 18:34
Sensis_Classifieds_J2EE_Framework.doc.good
-rw-r--r-- 1 lakshman dev 171520 Feb 3 18:13
Sensis_Classifieds_Logging.doc
lakshman@bart:~/Common-trunk >
Thanks
Lakshman
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Feb 3 09:13:18 2006