http://svnbook.red-bean.com/en/1.1/ch03s05.html#svn-ch-3-sect-5.4
________________________________ From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Boots, Paul Sent: Thursday, November 29, 2007 12:27 PM To: [email protected] 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: [EMAIL PROTECTED] phone <mailto:[EMAIL PROTECTED]> : +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
_______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
