Re: Book Merge committed to HEAD

2004-10-17 Thread Neil Williams
On Sunday 17 October 2004 1:31 am, David Grant wrote: > Derek Atkins wrote: > >Hi, > > > >I just committed Neil's book-merge code to HEAD. A couple of notes: > > What is book-merge? Framework to merge two QofBook* objects with collision handling http://cvs.gnucash.org/docs/HEAD/group__BookMerge.h

Re: Book Merge committed to HEAD

2004-10-16 Thread David Grant
Derek Atkins wrote: Hi, I just committed Neil's book-merge code to HEAD. A couple of notes: What is book-merge? Dave -- David J. Grant http://www.davidgrant.ca:81 begin:vcard fn:David Grant n:Grant;David adr:;;;Richmond;BC;;Canada email;internet:[EMAIL PROTECTED] tel;pager:604-450-0568 x-mozill

Re: Book Merge committed to HEAD

2004-10-16 Thread Derek Atkins
David Hampton <[EMAIL PROTECTED]> writes: > There's a script that does most of the work of the conversion, then I > just have to fix one or two things the script doesn't get quite right. > Been a while since I did one of these, but I don't remember it being > that hard. Oh, in that case we'll de

Re: Book Merge committed to HEAD

2004-10-16 Thread David Hampton
On Sat, 2004-10-16 at 14:59, Derek Atkins wrote: > David Hampton <[EMAIL PROTECTED]> writes: > > > On Sat, 2004-10-16 at 08:56, Derek Atkins wrote: > >> 3) This code (the druid in particular) will need to get ported to the > >>g2 branch. > > > > I'll take care of this during the next merge, wh

Re: Book Merge committed to HEAD

2004-10-16 Thread Derek Atkins
David Hampton <[EMAIL PROTECTED]> writes: > On Sat, 2004-10-16 at 08:56, Derek Atkins wrote: >> 3) This code (the druid in particular) will need to get ported to the >>g2 branch. > > I'll take care of this during the next merge, which will be sometime in > the middle of November. Ahh, I was t

Re: Book Merge committed to HEAD

2004-10-16 Thread David Hampton
On Sat, 2004-10-16 at 08:56, Derek Atkins wrote: > 3) This code (the druid in particular) will need to get ported to the >g2 branch. I'll take care of this during the next merge, which will be sometime in the middle of November. David signature.asc Description: This is a digitally signed m

Re: Book Merge committed to HEAD

2004-10-16 Thread Derek Atkins
Neil Williams <[EMAIL PROTECTED]> writes: > After using --disable-ofx with autogen.sh and rebuilding, it built OK. Yep. > gnucash --nofile > File -> Add New Hierarchy > merge druid starts, Next. > hierarchy druid starts, Next. > Currency selector appears with the full list, I select GBP, Next. >

Re: Book Merge committed to HEAD

2004-10-16 Thread Neil Williams
On Saturday 16 October 2004 6:26 pm, Neil Williams wrote: > On Saturday 16 October 2004 4:56 pm, Derek Atkins wrote: > > 2) There are still a bunch of bugs in the code. I started with an > >empty data file and ran the File -> Add Hierarchy menu item. > >It showed me the "choose a currency"

Re: Book Merge committed to HEAD

2004-10-16 Thread Derek Atkins
Neil Williams <[EMAIL PROTECTED]> writes: > On Saturday 16 October 2004 4:56 pm, Derek Atkins wrote: >> 1) you will need to "rm src/engine/.scm-links" in your build tree to >>get this to build properly. > > Was there a way to avoid this? I did tweak the makefile config to build the ./ > => qo

Re: Book Merge committed to HEAD

2004-10-16 Thread Neil Williams
On Saturday 16 October 2004 4:56 pm, Derek Atkins wrote: > Hi, > > I just committed Neil's book-merge code to HEAD. A couple of notes: > > 1) you will need to "rm src/engine/.scm-links" in your build tree to >get this to build properly. Was there a way to avoid this? I did tweak the makefile

Book Merge committed to HEAD

2004-10-16 Thread Derek Atkins
Hi, I just committed Neil's book-merge code to HEAD. A couple of notes: 1) you will need to "rm src/engine/.scm-links" in your build tree to get this to build properly. 2) There are still a bunch of bugs in the code. I started with an empty data file and ran the File -> Add Hierarchy men