On 5/20/05, Tommy Pettersson <[EMAIL PROTECTED]> wrote: > Did you ever sync the snapshot repo and the source code repo, > that is, did the patches that updates the line numbers in > the code repo get pulled to the snapshot repo so that new > snapshot update changes was made against newer line numbers?
Hmm.. No, the snapshot repo is basically the vendor branch -- it only contains changes from the vendor, I never pull into the snapshot repo from local mods. I do submit changes back to the vendor, and so they will eventually become incorporated in future snapshots. > I ask, because this would be a typical case where darcs gets > exponential if you don't, and it's not so much darcs fault as > the nature of the complexity of the growing merge situation > that's built up this way. I've been doing this for months in another SCM system, and the merges never took more then a few seconds.. Not only that, but it produced better results as well. The last time I managed a merge of line number changes, the results were pretty bad. There were lots of lines marked as conflicts which had only 1 option. Eg, I had many entries like this: v v v v v v v modified text here ^ ^ ^ ^ ^ ^ ^ (no ************** separator and second option at all). I wrote a small perl script to fix them rather then do it by hand.. > Perhaps you can even run the new SCM in the > same directory: pull in some patches to get to the next state > and check in the new state in the new SCM, repeat. Good idea - I forgot that I've been doing this with some code that is stored remotely in CVS, but I keep my local development in darcs.. thanks for the advice. v. _______________________________________________ darcs-users mailing list [email protected] http://www.abridgegame.org/mailman/listinfo/darcs-users
