[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [Subclipse-users] Files which never merge properly

From: jcompagner <jcompagner_at_gmail.com>
Date: Fri, 4 Sep 2009 21:33:49 +0200

Yes you are encountering what i call a bug but subversion a feature :(

If i merge files X and Z, by selecting the dir they contain in or the
project, then only those files should be changed, and not suddenly
also all the other files that are also in that container (dir or
project)

This is just weird, confusing (see your mail, you are not the first)
and in my eyes really wrong behavior. This should be at least a
property or something so that i can turn it off.

For now i have stressed out to all my co workers that merging should
only be done at the project level an never on files or dirs in a
project.

Not always does that happen so i keep deleting svn:merge properties
when i merge :(

Johan

On 04/09/2009, Steve Cohen <scohen_at_javactivity.org> wrote:
> I am maintaining two branches of code. At some point, months ago, I
> moved files from one directory to another. Something got screwed up, I
> don't remember what it was.
>
> At any rate, whenever I do a merge between these two branches, these
> files, which are identical both in content and location (in the new
> directory) between the two branches show up as needing to be checked
> into SVN on the branch into which the merge was done, in spite of no
> changes being present. I have tried everything to make this go away,
> but I cannot. I always include them in my commits and they always
> return the next time I do a merge. It's not a show-stopper but it is an
> annoyance. How can I get rid of it?
>
> ------------------------------------------------------
> http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2391041
>
> To unsubscribe from this discussion, e-mail:
> [users-unsubscribe_at_subclipse.tigris.org].
>

------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2391096

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2009-09-04 21:34:03 CEST

This is an archived mail posted to the Subclipse Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.