Login | Register
My pages Projects Community openCollabNet

Discussions > users > Re: After a merge some files are (erroneously?) shown as modifed

Project highlights: :. Download .: :. Support .: :. FAQ .: :. Translations .: :. Donate .: :. Report Bug .:

tortoisesvn
Discussion topic

Back to topic list

Re: After a merge some files are (erroneously?) shown as modifed

Author mikedixon
Full name Mike Dixon
Date 2009-02-25 12:50:03 PST
Message On 2/25/2009 12:23 PM, Bob Archer wrote:
> The merge problem created them on the files in the branch. I don't know
> why this happens. I have read the most of this was cleaned up in 1.5.5.
>
In 1.5.0-1.5.4 clients, when you do a repo-to-repo copy (and therefore,
also when you do a rename) it will generate an svn:mergeinfo property on
the affected file. Versions 1.5.5 and later are smarter about not
including the mergeinfo if it isn't needed.

-Mike

« Previous message in topic | 9 of 10 | Next message in topic »

Messages

Show all messages in topic

After a merge some files are (erroneously?) shown as modifed blackhole at collab dot net blackhole at collab dot net 2009-02-25 01:01:16 PST
     RE: After a merge some files are (erroneously?) shown as modifed pilotbob Bob Archer 2009-02-25 09:00:18 PST
         RE: After a merge some files are (erroneously?) shown as modifed blackhole at collab dot net blackhole at collab dot net 2009-02-25 12:14:38 PST
             RE: After a merge some files are (erroneously?) shown as modifed pilotbob Bob Archer 2009-02-25 12:23:47 PST
                 RE: After a merge some files are (erroneously?) shown as modifed blackhole at collab dot net blackhole at collab dot net 2009-02-25 12:34:56 PST
                     RE: After a merge some files are (erroneously?) shown as modifed pilotbob Bob Archer 2009-02-25 12:54:30 PST
                         RE: After a merge some files are (erroneously?) shown as modifed blackhole at collab dot net blackhole at collab dot net 2009-02-25 13:48:44 PST
                         RE: After a merge some files are (erroneously?) shown as modifed webpost at tigris dot org webpost at tigris dot org 2009-04-03 11:19:19 PDT
                 Re: After a merge some files are (erroneously?) shown as modifed mikedixon Mike Dixon 2009-02-25 12:50:03 PST
                     RE: Re: After a merge some files are (erroneously?) shown as modifed blackhole at collab dot net blackhole at collab dot net 2009-02-25 14:02:05 PST
Messages per page: