Hi there,<br><br>Anybody who could help me with an SVK smerge problem? <br><br>I have tree //mirror/a:<br><br>a/test.txt<br>a/lib/blah.txt<br>
a/lib/moreblah.txt<br>
<br>I copy this tree to b, svk cp //mirror/a //mirror/b<br><br>So I have <br><br>a/test.txt<br>
a/lib/blaha.txt<br>
a/lib/blahb.txt<br>
a/lib/blahc.txt<br>
a/lib/blahd.txt<br>
<br>
b/test.txt<br>
b/lib/blah.txt<br>
b/lib/blaha.txt<br>
b/lib/blahb.txt<br>
b/lib/blahc.txt<br>
b/lib/blahd.txt<br>
<br>
Now I modify these files:<br><br>
a/test.txt<br>
b/test.txt<br>
a/lib/blaha.txt<br>b/lib/blaha.txt<br>
b/lib/blahb.txt<br><br>Now, I want to smerge the changes from a/lib to b/lib and from b/lib to a/lib.. This means, I do NOT want to merge the changes in the file test.txt from either tree.<br><br>If I svk smerge //mirror/b //mirror/a, all goes well, I see these files merged:<br>
m b/test.txt<br>
c b/lib/blaha.txt<br>
m b/lib/blahb.txt<br>
<br>But, as said, I don't want to merge test.txt, so I svk smerge //mirror/b/lib //mirror/a/lib. Now, all hell breaks loose, and I see ALL files in lib/ merged, including the ones that were not even changed! All show up with state either g, gg or G.. Worse, each file modified in both a and b tree now conflicts and when checking the conflict I get THEIRS (the entire contents of the file from tree a) ORIGINAL (nothing, empty) and YOURS (contents of the entire file from tree b).. Even though a tree only had a line changed in the top of the file and b tree only had a line changed in the bottom of the file, so this doesn't make any sense to me..<br>
<br>g b/lib/blah.txt<br>
g b/lib/blaha.txt<br>
g b/lib/blahb.txt<br>g b/lib/blahc.txt<br>
g b/lib/blahd.txt<br>
<br>What is this about? I thought svk could do these smerges without problems. How can I smerge only a part of the tree I copied? <br><br>Thanks a lot for any and all help on this subject!<br><br>-- <br>Sven Oostenbrink<br>
Coordinador KIO-Labs, KIO Networks<br><br>NOC: 01-800-5 CALL-KIO<br><br><a href="http://www.kionetworks.com">www.kionetworks.com</a><br><a href="http://www.trustmeitsnotmagic.com">www.trustmeitsnotmagic.com</a><br><br>Este mensaje es confidencial. Si usted no es el destinatario de este mensaje, le suplicamos se lo notifique al remitente mediante un correo electrónico y que borre el presente mensaje y sus anexos de su computadora sin retener una copia de los mismos. No debe copiar este mensaje o usarlo para cualquier propósito ni divulgar su contenido. KIO Networks se reserva el derecho de monitorear todas las comunicaciones de correo electrónico (relacionadas o no con KIO Networks) que se transmitan a través de su sistema. Muchas gracias.<br>
<br>This email is confidential and may also be privileged. If you are not the intended recipient please immediately advise the sender by reply e-mail and delete this message and its attachments from your computer without retaining a copy. You should not copy it or use it for any purpose nor disclose its contents to any other person. KIO Networks reserves the right to monitor all email communications (whether related to the business of KIO Networks or not) through its networks. Thank you.<br>