[Svnmerge] (no subject)

[Boots, Paul]

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> 

 

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