Hi!
*Introduction*
*==========*
I've make a log against the public Apache Subversion repository to explore
the 1400377 revision:
svn log -v -g -r 1400377:1400377 https://asf.apache.org/repos/asf/
most of the retrieved logs have sense, but I found two cases that maybe
someone might explain me:
the strict log of the 1400377 (without merge info) is:
------------------------------------------------------------------------
r1400377 | desruisseaux | 2012-10-20 08:23:24 +0200 (Sat, 20 Oct 2012) | 1
line
Changed paths:
M /sis/branches/JDK6
M /sis/branches/JDK6/ide-project/NetBeans/nbproject/project.xml
M /sis/branches/JDK6/pom.xml
M
/sis/branches/JDK6/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java
M
/sis/branches/JDK6/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Section.java
M
/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapWithSpecialCases.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/util/DaemonThread.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/util/Executors.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/util/ReferenceQueueConsumer.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/util/Threads.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/math/MathFunctions.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/ArgumentChecks.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/Arrays.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/CharSequences.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/Characters.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/Classes.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/ComparisonMode.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/Debug.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/Exceptions.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/LenientComparable.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/Numbers.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/StringBuilders.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/Utilities.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/Workaround.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/BackingStoreException.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/Cache.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/CacheEntries.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedArrayList.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedHashMap.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedHashSet.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/Collections.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/WeakEntry.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/WeakHashSet.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/WeakValueHashMap.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/package-info.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/logging/LoggerAdapter.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/logging/Logging.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/logging/PerformanceLevel.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/logging/package-info.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/package-info.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/package-info.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/type/AbstractInternationalString.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/type/DefaultInternationalString.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/type/Types.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/type/package-info.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/IdentifiedObject.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/IdentifierMap.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/IdentifierSpace.java
M
/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/XLink.java
M
/sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/internal/jaxb/IdentifierMapAdapterTest.java
M
/sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/internal/util/ReferenceQueueConsumerTest.java
M
/sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/Assert.java
M
/sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/TestCase.java
M
/sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/TestRunner.java
M
/sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/TestUtilities.java
M
/sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/XMLComparator.java
M
/sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/package-info.java
M /sis/branches/JDK6/src/main/javadoc/stylesheet.css
which shows some changes under the /sis/branches/JDK6 directory.
When the -g param is added the two revisions below (among many others) are
got:
*(case A)*
*========*
------------------------------------------------------------------------
r1400370 | desruisseaux | 2012-10-20 07:10:40 +0200 (Sat, 20 Oct 2012) | 1
line
Changed paths:
*M /sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties*
M /sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml
Merged via: r1400377
*(case B)*
*========*
------------------------------------------------------------------------
r1399621 | desruisseaux | 2012-10-18 14:34:18 +0200 (Thu, 18 Oct 2012) | 1
line
Changed paths:
*M /sis/branches/JDK6*
Merged via: r1400377, r1399642
*Questions*
*==========*
*(Q.1)*Why is the
*M /sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties*
present in the merge log (r1400370)whether it is not in the (r1400377)
log. Does
it mean that the genfiles.properties_at_1400370 was merged into the
/sis/branches/JDK6_at_1400377 but it was just the same file and therefore it
was not modified in the r1400377?
*(Q.2)* What does it mean? It looks like the */sis/branches/JDK6 *directory
was merged against itself...
Thanks for your help to understand these merges.
Pablo
Received on 2013-12-20 09:29:51 CET