[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: Philip Martin <philip_at_codematters.co.uk>
Date: 2002-08-09 19:14:34 CEST

Karl Fogel <kfogel@newton.ch.collab.net> writes:

> Philip Martin <philip@codematters.co.uk> writes:
> > Doesn't setting svn:merge on every file affect the complexity at
> > commit time?
> I think he's only proposing to set it "when merging data into a file",
> that is, on files that would change anyway.

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.

Philip Martin
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:15:08 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.