To speed up my ability to keep track of my own changes, I'd like to use git. My team is using RTC (Rational Team Concert). There is a nice perforce integration with git: http://kb.perforce.com/article/1417/git-p4. I could not find anything like this yet for git-RTC. Note, there is an article on how you might integrate RTC with another SCM such as git: https://jazz.net/library/article/194. However, I'm looking for the type of detailed workflow instructions provided by the p4-git bridge, such as how you set up your files, how to keep files in sync, how to send git commits to RTC.
I'd like to know if anybody else has solved this problem.
I'm considering either:
In either case, I'd do a git stash to save my own changes, so that the sync'ing changes are stored in their own commits.
If I do #1, I'm guessing my changes will simply be ready to commit to RTC, maybe using the GUI or command line.
In the case of #2, if I have done intermediate commits, maybe I can use git rebase to reorder the commits so mine are sequentially at the end, and then create a patch file to apply to the main RTC sandbox.
Another thought is to try to rewrite the p4 scripts to support RTC. I don't yet know enough yet about the RTC command line interface to assess this.
The simplest way remains 1/ "git within the RTC sandbox (local workspace)"
Add the .git directory to your
.jazzignore and you can start working.
The pending changes of your RTC will pick up whatever has changed in your git working tree.
However, should you want to keep your git working tree separate from your RTC sandbox, you can consider using
GIT-WORK-TREE in order for your git working tree to update itself with any change from your RTC sandbox.
See "Running “git status” against a repository located elsewhere in the system".