I work on a project where I regularly get code snapshots from an
external (upstream) source. My current procedure for merging these
drops works OK, but it seems like there ought to be a better way. Here's
what I do:
1. Unpack latest upstream snapshot into /path/to/<newdrop> (<newdrop> ==
snapshot date)
2. svn import /path/to/<newdrop> http://path/to/repository/drops/<newdrop>
3. cd /path/to/workingdir/root/of/external/tree
4. svn merge http://path/to/repository/drops/<lastdrop>
http://path/to/repository/drops/<newdrop>
There's two problems with this. The first problem is that I have to
keep track of what the last drop was. It's a minor annoyance that I
have to pay careful attention to this each time.
The second problem is harder: Dealing with local changes some of which
get fed back upstream and then subsequently show up in the next
snapshot? Currently I make the local changes on a separate branch
which I abandon at the next snapshot. This has been OK so far because
all my changes have been incorporated immediately upstream. I'm
dreading what might happen if I need to start maintaining a fork of some
part of the project (local changes that *don't* get merged upstream).
Anyone have any recommendations or critiques? Am I missing out on some
fancy subversion features that would make my life easier?
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jan 22 23:49:39 2004