On Thu, May 28, 2009 at 07:38:34PM +0200, Plaatje, Patrick wrote:
> Well the problem is that a few files keep having their mergeinfo
> property changed, so for example if I commit file_1 on branche_2 after
> a merge, it asks me if I would like to commit file_2 and file_3 as
> well, although these have not been included in the merge. SO far no
> real problem, as it could be just a glitch. But at the next
> merge->commit process, exactly the same files (file_2 and file_3) are
> marked as "dirty" again and needs to be recomitted. But there has been
> no change at all on these files........ So why do these two files (and
> not the 1000 others) keep popping up there?
It's impossible for me to say without detailed inspection of your
repository. Older versions of svn 1.5 had a bug where they would create
mergeinfo unnecessarily in certain move operations, so perhaps the
mergeinfo was created that way.
If you are 100% certain that file_2 and file_3 don't need the mergeinfo
changes they are receiving, you can delete the svn:mergeinfo property.
Later merges will then not try to keep ther mergeinfo up-to-date for
those files.
tyler
Received on 2009-05-28 19:45:49 CEST