Jazz Forum Welcome to the Jazz Community Forum Connect and collaborate with IBM Engineering experts and users

How to merge serveral revisions with RTC source control

Hi,
I want to merge serveral revisions from branch1 to branch2.
For example, I just need to merge revision 100 to 105, the newest revision is 120, so how can I do that with RTC?

We used SVN before, we can easily use 'svn merge' to implement.

0 votes



3 answers

Permanent link
In RTC, you identify revisions and merge via "change sets" (which are
logically related sets of revisions), rather than by individual
revisions. And in RTC, a branch is called a "stream".

So to merge change sets 100 to 105 to a stream named branch2, you would:
- select (or create) a repository workspace whose current flow target is
stream2, and accept all change-sets from stream2 into the repo workspace.
- accept change sets 100 through 105 into that workspace
- deliver those change sets to branch2.

Cheers,
Geoff

On 3/22/2011 9:53 AM, saphen wrote:
Hi,
I want to merge serveral revisions from branch1 to branch2.
For example, I just need to merge revision 100 to 105, the newest
revision is 120, so how can I do that with RTC?

We used SVN before, we can easily use 'svn merge' to implement.

0 votes


Permanent link
I can not find accepting change-sets on RTC2.0, but there has history of branch1's component.
I can select several comments from history to accept, but it just affects current component. It would not merge to branch2.

0 votes


Permanent link
You'll definitely want to read up on the RTC source control model.
Minimally, you'll want to understand what a repository workspace is,
what a stream is, and how you flow changes with "accept" and "deliver".
Then you'll want to become familiar with the "Pending Changes" view.
That's what you'll use for many of your common SCM operations.

Cheers,
Geoff

On 3/24/2011 2:38 AM, saphen wrote:
I can not find accepting change-sets on RTC2.0, but there has history
of branch1's component.
I can select several comments from history to accept, but it just
affects current component. It would not merge to branch2.

0 votes

Your answer

Register or log in to post your answer.

Dashboards and work items are no longer publicly available, so some links may be invalid. We now provide similar information through other means. Learn more here.

Search context
Follow this question

By Email: 

Once you sign in you will be able to subscribe for any updates here.

By RSS:

Answers
Answers and Comments
Question details

Question asked: Mar 22 '11, 9:45 a.m.

Question was seen: 12,058 times

Last updated: Mar 22 '11, 9:45 a.m.

Confirmation Cancel Confirm