Quoting Juliusz Chroboczek <[EMAIL PROTECTED]>:
I'm using darcs to version some changes to SugarCRM, which is a pretty big
project in terms of files and data. SugarCRM just released 4.0.0beta, and
I've been working on 3.5.1d. What I wanted to do was this:
a) Start a new repository.
b) Pull these patches from my initial repo:
b1) Initial import of 3.5.1 (large)
b2) 3.5.1d update patch (medium-large)
c) unzip 4.0.0beta over top
d) record 4.0.0beta changes
... So far, so good ...
e) Pull my modifications from the initial tree
Yes, that should be the right approach, although I'd do it the other
way around (pull the new repo into the old one). This way you get to
keep the ``vendor branch'' in case you want to merge more vendor
patches in the future.
Hmmm... If I understand you right, that doesn't get me what I want.
I'd like the vendor patches to be on the "bottom" so I can e-mail my
patches (on "top") to the vendor when done. That means that I have to
resolve conflicts when pulling my patches on top of 4.0.0beta, and that
was my intent.
No matter what I do, I cannot get e) to complete.
Just in case, is b2 a patch against the original 3.5.1, or does it
contain or undo some of your local changes which were then committed
again? I'll assume the former; if the latter, let me know.
I have some of my own patches in the initial repository between 3.5.1
and 3.5.1d, but 3.5.1d has no dependencies other than 3.5.1. To
restate for clarity's sake, the patches do not intersect. (Which means
I could unpull the patch from the repository and go about my merry way,
come to think of it.)
Is there something I can do to make this work?
How large is patch d? You should have at least twice as much physical
memory; if you don't, you should split it into smaller patches, for
example one patch per subdirectory.
This gives me a couple ideas to work with. I'll report back. But also
makes me wonder since I'm having a similar-looking problem on a
different repo on a machine with 2gig of memory and a 51M repository...
but my poor brain can only handle one problem at a time.
Let us know if that fixes your problem; if not, you'll need to do a
manual merge, or wait a few months for a faster version of Darcs.
Also, I've checked on the wiki, which mentions --enable-antimemoize,
but that seem to have disappeared from 1.0.5 without a trace.
Indeed. Could you please fix the wiki?
No problem. After I get some things working, I'll update the whole page.
Juliusz
--
Jason M. Felice
Cronosys, LLC <http://www.cronosys.com>
216-221-4600 x302
_______________________________________________
darcs-users mailing list
[email protected]
http://www.abridgegame.org/mailman/listinfo/darcs-users
