Hi there. Forgive me if this has been answered before - I can't find
where it has, but I may have missed something.
I am considering changing from CVS to darcs for a particular project.
We have multiple branches in CVS. Here is the branch tree:
head
|
+--stable-0-68
| |
| `--customized-0-68
|
+--stable-0-71
|
`--customized-0-71
Basically, we do main-line development on head for the next major
release. Each time we make a major release, we create a
stable-<major>-<minor> branch. Bugfix releases are made from those
branches. The "customized" branches are private development with some
additional features for local use that are not included in what we
distribute for others' use.
Bugfixes are merged from the latest "stable" branch to head.
Using "tailor," I have been able to convert each branch to a darcs
repository with its full history in nice patches rather than random
one-file patches as CVS produces.
I have experimented and I can do every part of our work flow with
darcs. However, it is the step of finalizing the conversion from CVS
that is giving me trouble.
Basically, I want to make the tailor-generated stable-0-71 branch
appear to darcs to be a branch from head and not a completely
independent repository. I am therefore trying to find a way to
reconcile the two. However, I can't even really begin this, since
(from the "stable" repository) the command "darcs push
path-to-head-repository" asks me about which patches I want to push,
and then sits at 100% CPU for as long as I let it (I've let it go for
at least two hours before) after I finish making my selections.
Is there a better way? Should I just wait for the next major version
release to convert to darcs and hope that I don't have to make
bugfixes to old stable branches? Thanks!
_______________________________________________
darcs-users mailing list
[email protected]
http://www.abridgegame.org/mailman/listinfo/darcs-users
