|
Boost-Build : |
From: Vladimir Prus (ghost_at_[hidden])
Date: 2002-02-11 08:47:58
David Abrahams wrote:
> > Good. Unfortunately, I've not finished projects support yet, been
> > somewhat blocked with what I'm talking about in "Problems with crawl-up
> > behaviour" tread.
>
> As you can see from my messages, I don't see any problems there. Everything
> seems pretty obvious to me. Am I missing something?
Hmm... I was trying to state that we can't have decent crawl-up behaviour
without glob. Do you think it's possible?
> > I'll probably try to merge Glob changes from jam 2.4. BTW,
> > perforce_jam_2_4 branch cannot be used for merge at all -- CVS just gives
> > a
> > long list of complains. Shall we try to create a branch once again, or
> > use diff3 locally?
>
> OUCH!
>
> You're right; it's completely useless the way it is because CVS doesn't
> like the fact that the source was initially added on a branch. The only way
> to recover, AFAIK, is to rebuild the repository history :-(
Or to create yet another branch.
> My sense is that we're hosed and must resort to a local diff3 (or switch to
> using Perforce...but I don't want to chance it right now). Emacs can help
> with ediff.
OK, will try this way.
- Volodya
Boost-Build list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk