Hi, sorry, I didn't ready your email properly. I didn't pay attention to the exact format of the file names, as I usually just use TortoiseSVN -> Resolve Conflicts, and don't really care about the file names. But I imagine that this might not work here due to the double extension? http://svnbook.red-bean.com/en/1.4/svn.branchmerge.copychanges.html#svn.branchmerge.copychanges.bestprac.merge says: Another small difference between svn update and svn merge are the names of the full-text files created when a conflict happens. In the section called "Resolve Conflicts (Merging Others' Changes)" <http://svnbook.red-bean.com/en/1.4/svn.tour.cycle.html#svn.tour.cycle.resolve> , we saw that an update produces files named filename.mine, filename.rOLDREV, and filename.rNEWREV. When svn merge produces a conflict, though, it creates three files named filename.working, filename.left, and filename.right. In this case, the terms "left" and "right" are describing which side of the double-tree comparison the file came from. In any case, these differing names will help you distinguish between conflicts that happened as a result of an update versus ones that happened as a result of a merge. but's that not what you're seeing, either. Time to go back to the list and ask the real experts there... ciao Martina ________________________________
From: Boots, Paul [mailto:[EMAIL PROTECTED] Sent: Thursday, November 29, 2007 2:03 PM To: Oefelein, Martina Subject: RE: [Svnmerge] (no subject) I did read it again - but that only answers part of my question - i.e. the nature of the revision numbers. But why do my files get two extensions? The ".merge-left" and the ".rREV"? The book doesn't mention anything regarding that? Furthermore - the files in conflict don't have local changes before the merge. Even if I only merge one changeset I still get the conflict. 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> ________________________________ From: Oefelein, Martina [mailto:[EMAIL PROTECTED] Sent: Thursday, November 29, 2007 1:49 PM To: Boots, Paul Subject: RE: [Svnmerge] (no subject) read it again ________________________________ From: Boots, Paul [mailto:[EMAIL PROTECTED] Sent: Thursday, November 29, 2007 1:48 PM To: Oefelein, Martina Cc: [email protected] Subject: RE: [Svnmerge] (no subject) That's all good and well - I do know that chapter My question however is different - I do not ask why these extra files are created or how to solve conflicts. In addition: My files have both ".merge-left" and ".r<revision>" The ".merge-left" normally coming from a conflict during an 'svn update' and the ".r<revision>" normally coming from an 'svn merge' operation. Why do my files have both? And why are the files in conflict not affected by the changeset (revision) mentioned? 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> ________________________________ From: Oefelein, Martina [mailto:[EMAIL PROTECTED] Sent: Thursday, November 29, 2007 1:38 PM To: Boots, Paul Cc: [email protected] Subject: RE: [Svnmerge] (no subject) 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
