CQ Web/Rebase/GNATS Access
- Set up GNATS access for a user
- Helped Vinh with issues regarding old CQ Web and a bug that it has
- Assisted a few users with resolving Evil Twin problems
- More fully documented how to resolve Evil Twin problems by merging the parent directory
- Investigated implementing the other half of BinMerge where we use rebase instead of find merge
Rebase
Initially I thought that rebase did not work like findmerge in that it didn't have options for performing essentially the merge operate and just telling you what needed to merge. Turns out it does have that option - cleartool merge -preview -long. The long option causes rebase to list out what needs to be merged.
But rebase is more than just a findmerge. Additionally one needs to do the following:
- Create and set an activity for the view
- Check out items first
- Perform the merge with -abort noting which merges failed and how they failed
- Execute the rebase command to mark the view as being rebased
- Execute the rebase -complete to mark the rebase completed (IFF all elements are rebased)
Of course this is just a preliminary list - we still need to figure out if rebasing, merging actually, of directories need to be done first (probably), how to execute rebase to mark "rebase in progress" without actually attempting to merge anything, etc.