Re: git-svn and local feature branch (git svn dcommit error ?)

2011-05-21 Thread John Ralls
On May 21, 2011, at 2:52 PM, Christian Stimming wrote: > Am Samstag, 21. Mai 2011 schrieb Geert Janssens: >> I probably created this by dcommitting from two separate git working >> branches without first waiting for a repo sync, then git-updating and then >> rebasing my working branches to the ne

Re: OFX import from aqbanking (was: Fresh build of jhbuild and gnucash on OSX)

2011-05-21 Thread Martin Preuss
Hi, On Samstag 21 Mai 2011, Christian Stimming wrote: > Am Freitag, 20. Mai 2011 schrieb Brad Grupczynski: [...] > Maybe what you need instead here is a framework to use specific > configurable conversion rules. If you have any good solution how this can > be implemented in a user-configurable way

Re: git-svn and local feature branch (git svn dcommit error ?)

2011-05-21 Thread Christian Stimming
Am Samstag, 21. Mai 2011 schrieb Geert Janssens: > I probably created this by dcommitting from two separate git working > branches without first waiting for a repo sync, then git-updating and then > rebasing my working branches to the new trunk. > > Anyway the solution is the remove the .git/svn d

Re: OFX import from aqbanking (was: Fresh build of jhbuild and gnucash on OSX)

2011-05-21 Thread Christian Stimming
Am Freitag, 20. Mai 2011 schrieb Brad Grupczynski: > I didn't touch libofx. Only made aqbanking import match libofx file import > more closely. > > libofx uses a callback to split the fields where they need to go. What I > should do is figure out a way for them both to use the same callback. Or >

Re: git svn dcommit error ?

2011-05-21 Thread Geert Janssens
On zaterdag 21 mei 2011, Geert Janssens wrote: > On zaterdag 21 mei 2011, John Ralls wrote: > > On May 21, 2011, at 10:14 AM, Geert Janssens wrote: > > > On zaterdag 21 mei 2011, John Ralls wrote: > > >> On May 21, 2011, at 8:29 AM, Geert Janssens wrote: > > >>> On zaterdag 21 mei 2011, John Ralls

Re: git svn dcommit error ?

2011-05-21 Thread Geert Janssens
On zaterdag 21 mei 2011, John Ralls wrote: > On May 21, 2011, at 10:14 AM, Geert Janssens wrote: > > On zaterdag 21 mei 2011, John Ralls wrote: > >> On May 21, 2011, at 8:29 AM, Geert Janssens wrote: > >>> On zaterdag 21 mei 2011, John Ralls wrote: > Take a look at `git log --full-history A'..

Re: git svn dcommit error ?

2011-05-21 Thread John Ralls
On May 21, 2011, at 10:14 AM, Geert Janssens wrote: > On zaterdag 21 mei 2011, John Ralls wrote: >> On May 21, 2011, at 8:29 AM, Geert Janssens wrote: >>> On zaterdag 21 mei 2011, John Ralls wrote: Take a look at `git log --full-history A'..B src/gnome-utils/assistant-utils.c` (filling

Re: git svn dcommit error ?

2011-05-21 Thread Geert Janssens
On zaterdag 21 mei 2011, John Ralls wrote: > On May 21, 2011, at 8:29 AM, Geert Janssens wrote: > > On zaterdag 21 mei 2011, John Ralls wrote: > >> Take a look at `git log --full-history A'..B > >> src/gnome-utils/assistant-utils.c` (filling in the actual commit short > >> hashes for A' and B, of c

Re: git svn dcommit error ?

2011-05-21 Thread John Ralls
On May 21, 2011, at 8:29 AM, Geert Janssens wrote: > On zaterdag 21 mei 2011, John Ralls wrote: >> Take a look at `git log --full-history A'..B >> src/gnome-utils/assistant-utils.c` (filling in the actual commit short >> hashes for A' and B, of course). It should show what git thinks are the >> d

Re: git svn dcommit error ?

2011-05-21 Thread Geert Janssens
On zaterdag 21 mei 2011, John Ralls wrote: > Take a look at `git log --full-history A'..B > src/gnome-utils/assistant-utils.c` (filling in the actual commit short > hashes for A' and B, of course). It should show what git thinks are the > differences. > $ git log --full-history c46431964..gtk2.18

Re: git svn dcommit error ?

2011-05-21 Thread John Ralls
On May 21, 2011, at 2:16 AM, Geert Janssens wrote: > I recently switched to using a git repo as described in the wiki. This has > worked fine until yesterday. > > I'm currently trying to run a git svn dcommit to push some of my local > commits > to svn. This results in an error however: > >

git svn dcommit error ?

2011-05-21 Thread Geert Janssens
I recently switched to using a git repo as described in the wiki. This has worked fine until yesterday. I'm currently trying to run a git svn dcommit to push some of my local commits to svn. This results in an error however: $ git svn dcommit