On Mon, Aug 31, 2009 at 2:26 PM, Ville M. Vainio <[email protected]> wrote:
> > > >> That seems safer and cleaner (history-wise) than merging the trunk to > >> current 46-maint. > > > > I'd like to run an experiment or two. > > Alright. If you take this route, again do all the version number changing > stuff in trunk before branching. > I created a branch called trial-46-maint, pulled from lp:46-maint kdiff3 reports dozens of differences between this branch and my copy of the trunk. However, the only significant difference is leoVersion.py, which is expected because I changed it in the 46-maint branch after doing the merge of the trunk into 46-maint branch. So clearly, the branches should be equivalent, and it is safe to use the 46-maint branch as it is. As an experiment I did bzr pull lp:leo-editor in the trial-maint branch. Bzr reported, nothing to do, which, now that I think about it, makes sense, because nothing has changed **in the trunk** since I last merged the trunk into the 46-maint branch. Similarly, bzr merge lp:leo-editor reports nothing to do, which is reasonable for the same reason. I then created a temp-trunk branch pulled from lp:leo-editor, and did a bzr pull lp:46-maint. What do you know, only leoVersion.py and unittest/test_1.py were changed. bzr qlog in the branch is the same as in the 46-maint branch, which, again, now that I think of it, had better be the case. Finally, I reverted the temp-trunk branch, but that did nothing, which was surprising, but shouldn't be since a pull can't be reverted. In summary, I don't think anything more needs to be done to the 46-maint branch :-) Whatever the merits (or lack) the its present history, the diffs show that all is well. However, I won't object, Ville, if you disagree and want to recreate the 46-maint another way. If you do that, the version would change to Leo 4.6.3 b1. Edward --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "leo-editor" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/leo-editor?hl=en -~----------~----~----~----~------~----~------~--~---
