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. |
3 answers
Geoffrey Clemm (30.1k●3●30●35)
| answered Mar 22 '11, 8:05 p.m.
FORUM ADMINISTRATOR / FORUM MODERATOR / JAZZ DEVELOPER
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 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. |
|
Geoffrey Clemm (30.1k●3●30●35)
| answered Mar 24 '11, 5:55 p.m.
FORUM ADMINISTRATOR / FORUM MODERATOR / JAZZ DEVELOPER
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 |
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.