Stefan Schimanski wrote:
Hi!
As I got several requests whether I am still alive, I can give a
positive answer. Just had to organise a big move and lifted plenty of
IKEA boxes in the 4th floor for the last weeks. So Lyx had to wait.
I am starting right now to look in my dynmacro branch. I want to merge
it with trunk and wonder what the best strategy is. The branch is many
revisions (literally thousands, some time around 1.5 release) behind and
I need to merge in everything done from my last sync to now. This looks
like a major task and I would like to hear some suggestions how to do
that effectively. I started with the "svn merge" command and easily got
conflicts very fast and wonder if it is not better to take a diff from
the old trunk code to my branch and try to apply that to the trunk of
today. Any comments and experiences?
Stefan
I'm not sure it would help, but you might want to try using mercurial
for this. I've been using only mercurial for lyx for the past month or
so (not that I've been doing that much work on lyx, though ;) ). But I
have a mercurial repository set up and running (updated to within a
half-hour) which you could pull and work with locally. I think (but am
not sure) that merging branches should be much easier with mercurial
than with svn. It would require that you learn mercurial (but if you
have a few days for that, I think it would be worth your while, I'm
enjoying mercurial a lot --- not so much with LyX :( , but I've been
playing around with it also for projects at work and am quite
impressed). If you want help with setting it up and getting your
branches, let me know.
I think pavel also set up a git repository, if you would prefer trying
git (in which also, merging branches should be easier than with svn). If
you're interested in either of these options, check out
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg126441.html (I've
made some improvements since that post) and
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg126952.html, and
then you can contact me for more information on mercurial.
Nice to see you back!
Dov
