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

Re: Can a merge follow changes in paths in trunk/branch?

From: Matt England <mengland_at_mengland.net>
Date: 2006-02-10 21:13:43 CET

In an attempt to answer my own question here:

At 2/10/2006 01:27 PM, Matt England wrote:
> I hear that that there is no merge tracking...but that there is a lot
> of special things that merge does from diff. I'm finding myself
> thoroughly confused, in part because I don't yet understand why some
> merge intelligence would be put in without "all" the intelligence, but I
> suspect I will learn more about this if I choose to continue to study it
> (which might be hard to find time to do at this point).

I'm guessing this has to do with the fact that subversion tracks
directory/path changes, but doesn't yet handle these dir changes in merges
well...yet.

I'm still trying to see what my project can do to avoid a massive amount of
merge work.

-Matt

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Feb 10 21:17:05 2006

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