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

[TSVN] Re: Merging from branches to WC

From: Jens Scheidtmann <Jens.Scheidtmann_at_bayerbbs.com>
Date: 2005-01-19 14:31:44 CET

Please do *not* use full quotes!

crine <crine@4dconcept.fr> writes:

> Thanks for the answers,
>
> I'm going back to the documentation.
> I still don't understand quite well the "revision" thing.

A revision is a number uniquely identifying _all_ files in a
repository at a specific commit. When you commit, the number currently
tagged to the repository root is increased by one and this number is
associated with all files you've changed and you're committing *plus* it is
associated to all other files in the repository current before commit
(e.g. if you're working on trunk, this number gets associated to files
on branches, tags and all other directory present in the repository,
which you didn't touch with your commit --- this has been called
"bubbling up" in the early design documents of svn). The number
becomes the new HEAD revision.

> One more question.
> May I merge 2 branches ?

What do you mean by merging two branches?

Suppose you have two feature branches (see discussion in mailing list
archive), which both have all updates on the trunk.

You can then merge feature2 on branch2 into branch1 which then
contains feature1 and feature2. You could furtheron merge that back to
trunk, which then contains all changes + feature1 and feature2.

Jens

-- 
Jens.Scheidtmann@bayerbbs.com
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Jan 19 14:32:23 2005

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