Richard Riley <[EMAIL PROTECTED]> writes: > With regard to implementing branching for DVC and Git (branching being > core to most VCS I think, I guess something like > > http://gds.gsfc.nasa.gov/dvc-intro.html#Status-Display > > will be possible for the status?
I'm not clear how you think that applies; that section talks about the display for dvc-status. Can you give an example of "branching" and what describe what the display should be? For me, the sections "merging" and "propagating" in that document are more relevant for "branching". Note that each back-end has slightly different notions of what a "branch" is. In mtn, a "branch" is a named thread of revisions. But each branch can have multiple heads, created when multiple developers commit changes to the same branch. Then you need to "merge" to get back the one-head state. On the other hand, "propagating" is merging from one branch to another. So you have a main branch, and each developer has a work branch. As each developer finishes some portion of work, it is propagated to main. Each developer must also propagate from main to their work branch periodically. I don't see the need for a UI for this; a text file showing the purpose of each branch is sufficient, and the one-line status in the dvc-status buffer that says "branch is merged" or "branch is not merged" is sufficient. Hmm. It might be nice to have a brief log showing only the propagate operations; that would make it easier to know what propagate needs to be done next. But that's just a small variation on dvc-log. There is a UI for conflict resolution, but that is specific to mtn; most other back-ends don't have the same notion of "conflict". -- -- Stephe _______________________________________________ Dvc-dev mailing list [email protected] https://mail.gna.org/listinfo/dvc-dev
