From: Christiaan H. <cmh...@gm...> - 2007-11-29 10:21:19
|
On 29 Nov 2007, at 8:03 AM, Adam R. Maxwell wrote: > Anyone on the commit list will see some massive diffs from merging the > branch to the trunk. > > I did the merge manually with FileMerge, which isn't the most svn- > friendly way to do it. Since either svn or I screwed things up > silently last time I tried merging with svn, I didn't want to mess > with it. > > Currently it compiles, launches, and basic viewing works. A few > things that are likely broken: > > - MainMenu.nib; I know there are new/different menu items > > - IBOutlet NSPopUpButton *searchBookmarkPopUp in BibDocument; no idea > what this was connected to in the nib, and I didn't realize there were > changes to BibDocument.nib. So does this mean that all the latest changes to the trunk are lost? The popup was part of the search bookmark changes (folders etc). Christiaan |