On Fri, 23 Apr 2010, Malcolm J. Currie wrote:
>> So you must have locally committed a modified "ccdpack/component.xml"
>> before doing the rebase. Your modification would then be retained and
>> pushed to the head of the trunk.
Sorry, that wouldn't work, as you'd have to commit the change (to
ccdpack/component.xml) before the rebase, seems unlikely since the time
stamps put your commit later.
> I did the rebase, then the make world, which failed because of mag. I
> reconfigured and restarted make world. atools failed because of psx, so
> rebuilt psx manually, and then resumed make world again. When make world had
> completed I found the modified component.xml, checked the differences,
> committed it. It wouldn't have been the first time I committed somebody
> else's forgotten component.xml. (I must remind myself why this _built_ file
> is in the repository.)
It's something to do with generating the complete set of dependencies
(componentset.xml), so "make world" can function the first time.
> Now I think I also did a git stash and a later pull, as you suggest.
> Also your commit might have been around the time of the first pull.
Actually the stash seems the likely culprit for the confusion: stash, pull
--rebase, followed by stash apply would restore a modified component.xml,
if it was there before the pull.
> Note I've not been using git for a while and hadn't been able to update
> let alone rebuild. I've had issues before following a long hiatus
> between pulls.
I now use git for all my versioning, so it's still an everyday tool even
away from Starlink.
Peter.
|