Re: Merging of my dynmacro branch

[Stefan Schimanski]

So, the latter approach is probably much better and easier. Here is the patch, from the trunk revision that I synced too at the end and the branch:

  http://1stein.org/download/18290-20771.patch

Stefan

Am 06.10.2007 um 10:40 schrieb Stefan Schimanski:

Hi!





Stefan

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?

PGP.sig
Description: Signierter Teil der Nachricht