Hi I've notices a change in the svn info output when I have a tree conflict. The left and right are from the same branch. Is this correct? (svn 1.7 client to 1.6 server).
kiren@Pillay2:~/Documents/workspace-TRUNK/newServer$ svn info business_services/pams-bs-subscriber-account/src/main/java/za/co/vodacom/pams/bs/subscriber/SubscriberProfileQueryServiceImpl.java Path: business_services/pams-bs-subscriber-account/src/main/java/za/co/vodacom/pams/bs/subscriber/SubscriberProfileQueryServiceImpl.java Name: SubscriberProfileQueryServiceImpl.java Working Copy Root Path: /home/kiren/Documents/workspace-TRUNK/newServer URL: svn://bcx-svn/ vodacom.za/pams/newServer/trunk/business_services/pams-bs-subscriber-account/src/main/java/za/co/vodacom/pams/bs/subscriber/SubscriberProfileQueryServiceImpl.java Repository Root: svn://bcx-svn/vodacom.za Repository UUID: 5545304e-a938-48f1-8c5a-7cf7c6df13d1 Revision: 10708 Node Kind: file Schedule: normal Last Changed Author: aaronm Last Changed Rev: 10610 Last Changed Date: 2012-10-29 09:11:10 +0200 (Mon, 29 Oct 2012) Text Last Updated: 2012-11-07 16:18:50 +0200 (Wed, 07 Nov 2012) Checksum: e26a87463a2fb2509c669d6cc1f7e584a50ce5a5 Tree conflict: local add, incoming add upon merge Source left: (file) ^/pams/newServer/branches/v2-0-0-QA/business_services/pams-bs-subscriber-account/src/main/java/za/co/vodacom/pams/bs/subscriber/SubscriberProfileQueryServiceImpl.java@10569 Source right: (file) ^/pams/newServer/branches/v2-0-0-QA/business_services/pams-bs-subscriber-account/src/main/java/za/co/vodacom/pams/bs/subscriber/SubscriberProfileQueryServiceImpl.java@10701 Regards Kiren
