[Svnmerge] (no subject)

[Oefelein, Martina]

http://svnbook.red-bean.com/en/1.1/ch03s05.html#svn-ch-3-sect-5.4

________________________________

From: svnmerge-bounces+martina.oefelein=dionex.com at orcaware.com [mailto:svnmerge-bounces+martina.oefelein=dionex.com at orcaware.com] On Behalf Of Boots, Paul
Sent: Thursday, November 29, 2007 12:27 PM
To: svnmerge at orcaware.com
Subject: [Svnmerge] (no subject)



Hi,

 

After merging a range of revision from the trunk to a branch I had two files with a conflict.

Both files were in a different directory somewhere in the tree

 

Next to each file in conflict I had 3 additional files

 

<filename>

<filename>.merge-left.r21060

<filename>.merge-right.r21172

<filename>.working

 

The are two things that I find strange and don't understand.

 

1.	When checking the log for these specific revisions neither of these files were in these changesets 
2.	Both files in conflict had the same 3 additional files pointing to revision 21060 and 21172 

 

Can anyone clarify this?

 

Euroforum / Informa
Member of Project Fusion
email: Paul.Boots at informa.com
phone <mailto:Paul.Boots at informa.comphone> : +31 62 823 3494
web: www.informa.com <http://www.informa.com> 

 



                                                                                                                  
Dionex Softron GmbH
Rechtsform: Gesellschaft mit beschränkter Haftung
Sitz der Gesellschaft: Germering
Geschäftsführer: Dr. Peter Jochum
Zuständiges Registergericht: Amtsgericht München, HRB 717 65

-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/svnmerge/attachments/20071129/fb7a484a/attachment.html>