On Tue, Jul 25, 2006 at 03:22:33PM -0700, Nathaniel Gray wrote: > One last thing. I'm working on the code from darcs 1.0.8. Is that > going to be a problem? Should I update to the current devel version?
Well, darcs is designed to work this way, but it should not be taken to extremes, since darcs isn't magic. If all new features were recorded against stable, they would be "in parallel" when they meet in devel. This has the advantage that each feature can be pulled individually to stable, but it also has the disadvantage that the they might conflict with each other. Many such conflicts would be unproductive, especially if the devel maintainer had to do them and merge different features he/she doesn't know in detail. I'd say, small bugfixes and documentation fixes should be recorded against stable. Then they can for sure be pulled to stable. Should they have conflicts in devel, a resolve patch in devel fixes it and is relatively easy (for the patch author to supplie). When the conflicting patches are later pulled to stable, the resolve patch is pulled with them. If a bug fix is instead recorded against devel, it might be impossible to pull it to stable if it depends on some patch in devel that is not yet ready for stable. But for any larger changes (that don't need to go into stable at once) it is better to record them against devel. Stable is sort of only lagging behind devel a bit; devel is the trunk. But again, darcs is supposed to be good at reordering patches, so in many cases, when there are no conflicts and no complicated dependencies, it shouldn't matter too much in which branch a patch is recorded, but don't count on that (yet). -- Tommy Pettersson <[EMAIL PROTECTED]> _______________________________________________ darcs-devel mailing list [email protected] http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
