Bo Peng wrote:
I very warmly recommend using "quilt" (the best place I've found for
getting started with it is here:
http://www.coffeebreaks.org/blogs/wp-content/archives/talks/2005/quilt/quiltintro-s5.html)
When I first encountered this multiple patch/feature problem. I did a
similar search as you, and tried things like svk. Eventually, I ended
up with multiple local copies. It uses a lot of disk space (3G for
each tree) but it is so simple that you can not go wrong.
Bo
Well, if you haven't tried quilt, I suggest you do now. It's really
nice! (I think Stefan was converted when I mentioned it to him a couple
of months back!)
Regarding disk space --- if you're on a unix, you can try working with
hard links. This requires a lot of discipline, but it does work quite
well once you get used to it.
Basically, you copy the entire tee like this:
cp -la original/ copy/
Now each file is a hard-link, so you're taking up very little additional
space.
The hard part is, when you want to edit a file, you have to remember to
first "unlink" it, something like this will do:
cp file temp_copy; rm file; mv temp_copy file
Now it's not a hard link anymore, and any changes you make don't affect
all the other copies. Note that you may also be able to set your editor
to automatically unlink before writing a file, though I haven't been
able to get this working with vim... Tools like "patch" automatically
unlink before changing the file, so applying a patch to a copy is really
easy.
An additional advantage of this is that diff-ing the entire tree is now
super-fast, because most of the diffs don't have to be performed,
because the two copies are really the same file!
HTH!
Dov
