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

Re: Hello, and a branch/merge question

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-01-13 17:51:47 CET

On Mon, 2004-01-12 at 23:24, Pawel Rozanski wrote:

> And for my curiosity, How cost is for merge action ? I can understand
> notatnion, and copy is O(1).. but merge ? I suppose if i make change in
> branch B, and merge it back to A.. then i will have double data (changes
> for B, and one big change for merging into A)

Yes, you will have double data. From the repository's point of view,
there is no difference between these two things. At least, not in terms
of storage or database structure.

* copy /trunk to /branch
* edit /trunk/file, commit
* merge /trunk/file change to /branch/file, commit.


* copy /trunk to /branch
* edit /trunk/file, commit
* edit /branch/file in the same way, commit.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jan 13 17:52:42 2004

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

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