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

Re: [Subclipse-users] subclipse merge touching non-changed files

From: jcompagner <jcompagner_at_gmail.com>
Date: Wed, 11 Mar 2009 10:48:15 +0100

I think if you search this user list you will find my discussion also

Subversion merge just does something wrong in my eyes. What happens if you
merge a file itself (so you dont go through project level or a dir, but only
the file)
that file gets merge properties.

When you then merge another file. Subversion sees the previous file as also
having merge properties and will also update that one
So what you see is a file that has updated merge properties

What we do now here in our company is always merge the project, never files.
And if by accident the file is merged we throw away the merge properties of
that file.

I dont see why they have to do that. If that file is not in this merge, then
the file shouldnt be touched. Because if i throw it away anyway after that
nothing is broken
at least not that i can see. Everything works fine.


On Wed, Mar 11, 2009 at 10:06, Noel Grandin <noel_at_peralex.com> wrote:

> Hi
> Situation:
> I do repeated merges from a branch back onto trunk, cherry-picking
> specific revisions.
> Problem:
> After the first couple of merges from a given trunk, lots of files in the
> trunk project end up "touched" somehow.
> This means that they show up in the "Team Synchronizing" perspective, even
> though nothing has actually changed in those files.
> Am I doing something wrong? Is there a flag I should set to say "don't
> touch files that haven't actually changed"?
> Thanks, Noel.
> ------------------------------
> Disclaimer: http://www.peralex.com/disclaimer.html


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2009-03-11 10:48:29 CET

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.