>> For those interested in problem-free fixing of bugs in last >> final release, 2.0.x branch was created at the time of the release, >> and such work shall be done there. Volunteers may start it right >> away by merging '[TOMERGE 2.0]' marked patches from trunk to >> 2.0.x branch. This will ensure that users won't have to wait >> for next major release to get any bugs fixed, but they can get >> it much more quickly with 2.0.1. > > I wanted to start this process and since I'm a mercurial user I cloned > the repository. > I then started to examine the Changelog and it looks like that some > commits have changes that must be ported and some that shouldn't....
Yes, we try to mark everything worth porting back with '[TOMERGE 2.0]' signs. When merged, these marks are to be changed to '[MERGED 2.0]' in trunk, and entries gathered in 2.0.x branch ChangeLog file. > I'm not a svn user... I will check the syntax.. .I imagine there is a > svn diff (from revision) (to revision) and then import this patch into > mercurial harbour 2.0 branch Yes, there is. I used to do it manually in the past, so can't advise on the automated method, but sounds as reasonable one. AFAIK Mercurial syntax isn't that much different from SVN. Here's a good (and free) book about SVN: http://svnbook.red-bean.com/ Here's how diff command works: svn diff -r 13505:13506 Brgds, Viktor _______________________________________________ Harbour mailing list (attachment size limit: 40KB) [email protected] http://lists.harbour-project.org/mailman/listinfo/harbour
