Wed Jan 21 10:12:54 CET 2009
darcs SVN micromanagement
The idea is this: master repo = SVN, but i'd like to use darcs for
micro-managing my own changes. How to merge?
First, make sure there's a directory managed both by SVN and darcs:
- "darcs get" into empty dir
- remove the tree that's also in SVN
- checkout that tree
- perform merge bye reverting darcs patches
-> Concentrate on first taking in changes from SVN.
Given the way I use emacs, it's probably best to take the "current"
branch: that one with files loaded in emacs buffers as the merging
branch. Note however: this requires the SVN to be checked out in the