>> It looks like the same set of changes was committed to both trunk and
>> the branch, and nothing else ever happened on that branch. You're
>> saying that we should just drop that branch point and have the git
>> branch point at f44a35... (see gist linked above) as a stub branch
>> (that is, a branch with no commits of its own), yes?
>
> Yes.
Done. I think the only remaining thing is the keyword cleanup. I
presume what I suggested before works (keep keyword expansion as it
was in CVS; do a cleanup commit in git in all active branches to purge
expandable keywords; I believe this is what the main project did)? I
took out the "grep -v"s from the tag verification script to see what
was there, and there are some subtantial diffs around that. I tried
tweaking the cvs2git config, but that only gives different diffs. I
need to spend more time looking at this, but I should be done soon
(though if anyone has any insight here, I welcome it).
---
Maciek Sakrejda | System Architect | Truviso
1065 E. Hillsdale Blvd., Suite 215
Foster City, CA 94404
(650) 242-3500 Main
www.truviso.com