/[Apache-SVN]
ViewVC logotype

Revision 600876


Jump to revision: Previous Next
Author: gscokart
Date: Tue Dec 4 11:02:01 2007 UTC (16 years, 4 months ago)
Changed paths: 16
Log Message:
fix regression found when configuration extends private confuration and is transfered to an other version because of a conflict detected

Changed paths

Path Details
Directoryant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java modified , text changed
Directoryant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java modified , text changed
Directoryant/ivy/core/trunk/test/repositories/1/orgConflictAndPrivateConf/ added
Directoryant/ivy/core/trunk/test/repositories/1/orgConflictAndPrivateConf/modA/ added
Directoryant/ivy/core/trunk/test/repositories/1/orgConflictAndPrivateConf/modA/ivys/ added
Directoryant/ivy/core/trunk/test/repositories/1/orgConflictAndPrivateConf/modA/ivys/ivy-1.0.xml added
Directoryant/ivy/core/trunk/test/repositories/1/orgConflictAndPrivateConf/modB/ added
Directoryant/ivy/core/trunk/test/repositories/1/orgConflictAndPrivateConf/modB/ivys/ added
Directoryant/ivy/core/trunk/test/repositories/1/orgConflictAndPrivateConf/modB/ivys/ivy-1.0.xml added
Directoryant/ivy/core/trunk/test/repositories/1/orgConflictAndPrivateConf/modC/ added
Directoryant/ivy/core/trunk/test/repositories/1/orgConflictAndPrivateConf/modC/ivys/ added
Directoryant/ivy/core/trunk/test/repositories/1/orgConflictAndPrivateConf/modC/ivys/ivy-1.0.xml added
Directoryant/ivy/core/trunk/test/repositories/1/orgConflictAndPrivateConf/modC/ivys/ivy-1.1.xml added
Directoryant/ivy/core/trunk/test/repositories/1/orgConflictAndPrivateConf/root/ added
Directoryant/ivy/core/trunk/test/repositories/1/orgConflictAndPrivateConf/root/ivys/ added
Directoryant/ivy/core/trunk/test/repositories/1/orgConflictAndPrivateConf/root/ivys/ivy-1.0.xml added

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26