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

Re: Saving merge history (was: Re: merge should copy-with-history)

From: Karl Fogel <kfogel_at_newton.ch.collab.net>
Date: 2002-08-09 19:09:13 CEST

Philip Martin <philip@codematters.co.uk> writes:
> This is what Will wrote:
> > There is one detail that I think is important: If merge copies a
> > directory that didn't exist in revA (ie the dir was added with
> > history) then you want to add the merge property to each file
> > individually. This does not affect the time complexity as all those
> > files are being copied into your working copy anyway.
> The files get copied into the working copy, but they will show up as
> status copied-with-history and unmodified, so only the parent needs to
> be committed. If we set svn:merge on the files then the files will
> need to be committed as well.

Oh dear, yes. We should only set the property on the directory that
was copied... But of course, that loses some of the usefulness of
having the property at all, for example if we're in a subtree of that
directory later and need to retrieve merge history...

Which, now that I think about it, is what led me to the long-ago
conclusion that this problem is not simple. William, thoughts?


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Aug 9 19:25:55 2002

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

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