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

Re: [PROPOSAL] Merging Improved

From: Greg Hudson <ghudson_at_MIT.EDU>
Date: 2003-04-13 17:04:56 CEST

On Sat, 2003-04-12 at 22:08, Branko ╚ibej wrote:
> Imagine the following: I have branches A and B, where B was created from
> A. Now I change some files on A, and some on B. Every change on B causes
> a lazy copy of the changed files and their parent directories. Then I
> merge A to B, changing some files, but leaving most unchanged. Now, if I
> record the merge source on the unchanged files to satisfy b), then I
> have to lazily copy *all* the files to the branch;

Shouldn't we only have to do this for files which changed on A since the
branch was made? That doesn't seem too expensive.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Apr 13 17:13:48 2003

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.