On Nov 29, 2007, at 2:21 AM, Christiaan Hofman wrote: > > 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).
No, the code should all be intact. I chose the trunk for everything bookmark related. There were a lot of changes in the text import controller on both sides, so that was probably the trickiest one. I just ran out of time and had to go to sleep :). adam ------------------------------------------------------------------------- SF.Net email is sponsored by: The Future of Linux Business White Paper from Novell. From the desktop to the data center, Linux is going mainstream. Let it simplify your IT future. http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4 _______________________________________________ Bibdesk-develop mailing list Bibdesk-develop@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/bibdesk-develop
