> So, I'm doing another merge between two trees, and ran into this
> issue again, which reminded me that I never did get any info about
> what's going on...
>
> To summarize, my repo looks something like this:
>
> trunk -> branch1 -> branch1.1
> |
> '----> branch2
>
> I have a WC containing a checkout of branch2, and in that WC, I'm
> doing:
>
> svn merge https://my.repo/branches/branch1@somerev
> https://my.repo/branches/branch1.1
>
> The merge shows a bunch of files being "U"pdated, but those files
> haven't changed between branch1 and branch1.1, and indeed, despite
> the U lines, after the merge is done, those files in my WC aren't
> modified.
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.
What is the mergeinfo before you do your merge and after you do your merge on one of those files where the merge info is being updates but the files are not modified?
BOb
>
> And this time, there's something new: I'm getting conflicts on some
> files that are identical between branch1 and branch1.1. There's no
> mention of those files in a svn diff
> https://my.repo/branches/branch1@somerev
> https://my.repo/branches/branch1.1 (not even property changes) ,
> yet there's a conflict when merging? How is that possible? The
> files in question are all binary files, if that makes a difference.
>
> The docs imply that a merge is the equivalent of getting a diff and
> applying it, but that doesn't seem to be the case exactly, since
> the merge is trying to touch files that aren't mentioned in the
> diff.
>
> I've tried this with both commandline svn 1.6.5 and TortoiseSVN
> 1.6.10--same results.
>
> On Dec 15, 2009, at 5:33 PM, Dave Huang wrote:
>
> > On 12/15/2009 4:11 PM, Ryan J Ollos wrote:
> >> David Huang-5 wrote:
> >>>
> >>> So, I tried doing that, and I think it mostly worked, but a lot
> of files
> >>> were unexpectedly shown as "Updated"--I have no idea why they
> show up in
> >>> the
> >>> merge, since they haven't been modified between branch1 and
> branch1.1. It
> >>> seems to be harmless though; even though merge shows them as
> Updated,
> >>> they're not actually modified in the WC after the merge is
> done.
> >>>
> >>
> >> Pay close attention to whether the files are shown as having
> text
> >> modifications or property modifications. It is very likely that
> just the
> >> mergeinfo or another property on the files has changed.
> >
> > Both text modifications and property modifications will cause the
> file to be flagged as modified (e.g., with the "modified" overlay
> icon, or since that's not always reliable, in the "Check for
> modifications" window)--in this case, the overlay remained the
> "normal" one, and Check for modifications confirmed that neither
> the text nor properties were modified on many of the files listed
> as "Updated".
>
> --
> Name: Dave Huang | Mammal, mammal / their names are called
> /
> INet: khym_at_azeotrope.org | they raise a paw / the bat, the cat /
> FurryMUCK: Dahan | dolphin and dog / koala bear and hog --
> TMBG
> Dahan: Hani G Y+C 34 Y++ L+++ W- C++ T++ A+ E+ S++ V++ F- Q+++ P+
> B+ PA+ PL++
Received on 2010-09-17 19:38:57 CEST