Re: Question about merging
From: David Huang <khym_at_azeotrope.org>
Date: Fri, 17 Sep 2010 13:48:50 -0500
On Sep 17, 2010, at 12:38 PM, Bob Archer wrote:
> It is updating/writing merge info on those child nodes. There must have been a merge that was done at a level lower than the root folder of your project which put merge info on those files but not on the parent root folder.
There's no mergeinfo on the files in question either before or after the merge... and as mentioned, after the merge, neither the text nor properties of the supposedly-updated files are shown as modified.
BTW, on the binary files that are conflicted after the merge, the .merge-left and .merge-right files are identical. I.e., I see no conflict; it should've just used one of them.
This is an archived mail posted to the Subversion Users mailing list.