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 pilotbob
Full name Bob Archer
Date 2009-02-25 12:23:47 PST
Message > I'm aware of this, but I don't understand why there are any property
> changes on these files. These files have never been merged. They were
> added to trunk, and copied several times to tags. And they were copied
to
> the current feature branch where I'm seeing the problem.

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.

My question, do these properties show on the files in the WC of trunk or
not?

> So, am I safe if I commit these files to the branch or could there be
any
> problems in the future?

There probably safe, but also if those files weren't change in trunk
then you can just revert them to. It's hard to say without actually
being able to look at your repo and see what is in trunk and branch etc.

BOb

« Previous message in topic | 4 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: