On Sun, Nov 18, 2007 at 12:58:53PM +0100, Martin Baehr wrote:
no, i keep two branches, one for cvs import and one to work in. i made the exportcommit from the working branch and then tried the cvsimport on the import branch.
i tried clearing the cvsps cache, but that made no difference.
i tried importing again just now, and this time it worked. no clue why it didn't work yesterday.. possible difference was that this time i had the cvs branch checked out while running import.
my commit and the equivvalent commit from cvsimport got a different sha because my branch was not uptodate. need to consider that. running cvsexportcommit is like push and should generally only be done on an uptodate repo to make sure the commit applies cleanly.
sothe workflow should be:
work in local branch, commit stuff; run cvsimport on cvs branch; rebase local branch onto cvs branch; cvsexportcommit rebased branch; cvsimport to update cvsbranch;
greetings, martin.