Re: win32 trunk problems (was: daily build runs again)
Geert, I an a MS Windows user, and I like the nimbus theme. It looks good and provides a good interface with GnuCash. Regards, Kim -- View this message in context: http://gnucash.1415818.n4.nabble.com/win32-trunk-daily-build-runs-again-was-still-broken-tp3482316p3484773.html Sent from the GnuCash - Dev mailing list archive at Nabble.com. ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Setup question for the local git repo from github
Am Samstag, 30. April 2011 schrieb John Ralls: But at this point the git-update script results in the following error: You asked to pull from the remote 'origin', but did not specify a branch. Because this is not the default configured remote for your current branch, you must specify a branch on the command line. pull --rebase origin: command returned error: 1 This is git-1.7.0.4. I then tried to run git-update trunk which seemed to give me what I expected. But running the command again will still give me the above error message. Only if I run this with the additional trunk command I'll get what I expected. What am I missing? That you're checked out in the master branch and the github repo doesn't have one of those. I think that if you add [branch master] remote = origin merge = refs/heads/trunk to your .git/config git will know what you want to update. Turns out the creation of the master branch needs to use a different tracking argument. I've changed the wiki accordingly. Now it works fine. Regards, Christian ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Another gnucash git question
Dear John, Christian's recent mail reminded me I'm not using the github master repository yet for my git based gnucash work. So far I have been working in a repository created with git svn clone, independently from your github clone. I'd like to switch this to the setup based on the github master, but would also like to keep the myriad of branches I had created so far. Any suggestion to what would be the most practical migration path ? So far I tried this: - Backed up my direct svn based repo - Then I ran git remote add origin git://github.com/Gnucash/gnucash.git I skipped the git svn init step, because I figured my repo already has that information. - I installed git-update and fixed the library line. - Next I ran git-update on my repo. This command did a lot, but eventually failed. This is the truncated output from the git-update command: warning: no common commits remote: Counting objects: 158809, done. remote: Compressing objects: 100% (29291/29291), done. remote: Total 158809 (delta 129729), reused 157851 (delta 129010) Receiving objects: 100% (158809/158809), 85.28 MiB | 2.60 MiB/s, done. Resolving deltas: 100% (129729/129729), done. From git://github.com/Gnucash/gnucashh * [new branch] 1.6- origin/1.6 * [new branch] 1.8- origin/1.8 * [new branch] 1.8@7931 - origin/1.8@7931 * [new branch] 2.0- origin/2.0 * [new branch] 2.0@14476 - origin/2.0@14476 lots more [new branch] lines From git://github.com/Gnucash/gnucash * [new tag] 1-9-0@13157 - 1-9-0@13157 * [new tag] 1.6.6@4612 - 1.6.6@4612 * [new tag] 1.6.7@4608 - 1.6.7@4608 lots more [new tag] lines, You asked to pull from the remote 'origin', but did not specify a branch. Because this is not the default configured remote for your current branch, you must specify a branch on the command line. pull origin: command returned error: 1 And there I'm more or less stuck. Checking with gitk, I notice git-update has pulled in all the objects from the remote git setup again (I presume due to differing checksums), so my repo now has a remote/trunk (svn) and a remote/origin/trunk branch and similar for all other branches and tags. Based on the error message I have also rebased one branch from remote/trunk to remote/origin/trunk since they are code wise the same and tried git-update on this branch. But the error remains. Any idea how I can fix this to continue my work ? Geert ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Another gnucash git question
On Apr 30, 2011, at 5:36 AM, Geert Janssens wrote: Dear John, Christian's recent mail reminded me I'm not using the github master repository yet for my git based gnucash work. So far I have been working in a repository created with git svn clone, independently from your github clone. I'd like to switch this to the setup based on the github master, but would also like to keep the myriad of branches I had created so far. Any suggestion to what would be the most practical migration path ? So far I tried this: - Backed up my direct svn based repo - Then I ran git remote add origin git://github.com/Gnucash/gnucash.git I skipped the git svn init step, because I figured my repo already has that information. - I installed git-update and fixed the library line. - Next I ran git-update on my repo. This command did a lot, but eventually failed. This is the truncated output from the git-update command: warning: no common commits remote: Counting objects: 158809, done. remote: Compressing objects: 100% (29291/29291), done. remote: Total 158809 (delta 129729), reused 157851 (delta 129010) Receiving objects: 100% (158809/158809), 85.28 MiB | 2.60 MiB/s, done. Resolving deltas: 100% (129729/129729), done. From git://github.com/Gnucash/gnucashh * [new branch] 1.6- origin/1.6 * [new branch] 1.8- origin/1.8 * [new branch] 1.8@7931 - origin/1.8@7931 * [new branch] 2.0- origin/2.0 * [new branch] 2.0@14476 - origin/2.0@14476 lots more [new branch] lines From git://github.com/Gnucash/gnucash * [new tag] 1-9-0@13157 - 1-9-0@13157 * [new tag] 1.6.6@4612 - 1.6.6@4612 * [new tag] 1.6.7@4608 - 1.6.7@4608 lots more [new tag] lines, You asked to pull from the remote 'origin', but did not specify a branch. Because this is not the default configured remote for your current branch, you must specify a branch on the command line. pull origin: command returned error: 1 And there I'm more or less stuck. Checking with gitk, I notice git-update has pulled in all the objects from the remote git setup again (I presume due to differing checksums), so my repo now has a remote/trunk (svn) and a remote/origin/trunk branch and similar for all other branches and tags. Based on the error message I have also rebased one branch from remote/trunk to remote/origin/trunk since they are code wise the same and tried git-update on this branch. But the error remains. Any idea how I can fix this to continue my work ? Geert, The first line of git-update is the perl form of `git pull --rebase origin`, and it tacks whatever additional arguments on to it. If you're not checked out in a branch that also exists on github, then git doesn't know where to pull from. It's not good practice to pull directly from a repo into a working branch, so either `git checkout trunk` before running git-update or use `git-update trunk`. Don't add branches to refs/remotes anything. Hang your working branches off of your local mirror-branches (trunk and 2.4 if you have one; only trunk is made automatically) -- and in this case you need to check and make sure that your local trunk is pointed to refs/remotes/origin/trunk and not refs/remotes/trunk. Check the SHA1s for the HEAD of each, and the config to be sure. There are some notes under the refspec description in http://www.kernel.org/pub/software/scm/git/docs/git-pull.html that you may find helpful. Regards, John Ralls ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Another gnucash git question
On zaterdag 30 april 2011, John Ralls wrote: Geert, The first line of git-update is the perl form of `git pull --rebase origin`, and it tacks whatever additional arguments on to it. If you're not checked out in a branch that also exists on github, then git doesn't know where to pull from. It's not good practice to pull directly from a repo into a working branch, so either `git checkout trunk` before running git-update or use `git-update trunk`. Ok, I think I'm still not really into the git mindset. My repo didn't have a local branch named trunk, only refs/remotes/trunk. From your description I gather that's not good. So I used git branch -t trunk refs/remotes/origin/trunk to add a local trunk branch, tracking the github trunk branch. Seems to have worked fine. Next I ran git checkout trunk This issued following warning: warning: refname 'trunk' is ambiguous. But otherwise seems to have worked fine. Is that warning normal and should I just ignore it (I don't like that very much, but can get used to it). Don't add branches to refs/remotes anything. Hang your working branches off of your local mirror-branches (trunk and 2.4 if you have one; only trunk is made automatically) -- and in this case you need to check and make sure that your local trunk is pointed to refs/remotes/origin/trunk and not refs/remotes/trunk. Check the SHA1s for the HEAD of each, and the config to be sure. So I should rebase my branches off of the local trunk/2.4 branches. There is indeed a local trunk branch now (since I've manually created it), but not a 2.4 branch yet. I wanted to use the branch -t command to create one, but I noticed there are several 2.4 branches in refs/remotes/origin: one plainly 2.4 and then a couple with an svn ref added to it. Which one should I use ? And just to help me understand about how refs/remote works: * my original svn-tracking repo only contains refs/remote/trunk refs/remote/tags (empty directory) * when I clone github following the wiki, that repo will have refs/remote/lots of branch names refs/remote/origin (containing a file HEAD) * my svn-tracking-converted-to-github repo contains refs/remote/lots of branch names refs/remote/origin/lots of branch names and no HEAD file My config files for the clean github based repo and the converted repo seem to contain the same information in both cases though, which is encouraging. There are some notes under the refspec description in http://www.kernel.org/pub/software/scm/git/docs/git-pull.html that you may find helpful. Yes, that was useful, thanks. Geert ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Another gnucash git question
On zaterdag 30 april 2011, John Ralls wrote: Don't add branches to refs/remotes anything. Hang your working branches off of your local mirror-branches (trunk and 2.4 if you have one; only trunk is made automatically) Can you help me understand why this is not done ? If I look with gitk, I now have a commit with four branches on it: refs/remotes/origin/trunk refs/remotes/trunk trunk bugfix (my working branch) But there is nothing suggesting that my working branch if based on trunk or refs/remotes/origin/trunk. For completeness, bugfix is not a tracking branch. It was simply created with git branch bugfix I don't know if this is correct, or if this branch should have been tracking trunk. Geert ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Another gnucash git question
On Apr 30, 2011, at 9:06 AM, Geert Janssens wrote: On zaterdag 30 april 2011, John Ralls wrote: Geert, The first line of git-update is the perl form of `git pull --rebase origin`, and it tacks whatever additional arguments on to it. If you're not checked out in a branch that also exists on github, then git doesn't know where to pull from. It's not good practice to pull directly from a repo into a working branch, so either `git checkout trunk` before running git-update or use `git-update trunk`. Ok, I think I'm still not really into the git mindset. My repo didn't have a local branch named trunk, only refs/remotes/trunk. From your description I gather that's not good. So I used git branch -t trunk refs/remotes/origin/trunk to add a local trunk branch, tracking the github trunk branch. Seems to have worked fine. Next I ran git checkout trunk This issued following warning: warning: refname 'trunk' is ambiguous. But otherwise seems to have worked fine. Is that warning normal and should I just ignore it (I don't like that very much, but can get used to it). Don't add branches to refs/remotes anything. Hang your working branches off of your local mirror-branches (trunk and 2.4 if you have one; only trunk is made automatically) -- and in this case you need to check and make sure that your local trunk is pointed to refs/remotes/origin/trunk and not refs/remotes/trunk. Check the SHA1s for the HEAD of each, and the config to be sure. So I should rebase my branches off of the local trunk/2.4 branches. There is indeed a local trunk branch now (since I've manually created it), but not a 2.4 branch yet. I wanted to use the branch -t command to create one, but I noticed there are several 2.4 branches in refs/remotes/origin: one plainly 2.4 and then a couple with an svn ref added to it. Which one should I use ? And just to help me understand about how refs/remote works: * my original svn-tracking repo only contains refs/remote/trunk refs/remote/tags (empty directory) * when I clone github following the wiki, that repo will have refs/remote/lots of branch names refs/remote/origin (containing a file HEAD) * my svn-tracking-converted-to-github repo contains refs/remote/lots of branch names refs/remote/origin/lots of branch names and no HEAD file My config files for the clean github based repo and the converted repo seem to contain the same information in both cases though, which is encouraging. There are some notes under the refspec description in http://www.kernel.org/pub/software/scm/git/docs/git-pull.html that you may find helpful. Yes, that was useful, thanks. Geert, You want to track refs/remotes/origin/2.4. The other ones are git-svn artifacts. Regards, John Ralls ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Another gnucash git question
On zaterdag 30 april 2011, John Ralls wrote: You want to track refs/remotes/origin/2.4. The other ones are git-svn artifacts. Regards, John Ralls Ok thanks. I think I'm almost through now. There is one artifact still in my converted repo from how I originally imported the svn repo: I have a branch for each tag in svn. There were no actual tags at first sight, but I ran a git fetch -t origin This imported all tags as true tags. The tag-branches are still in the repo though and I would like to remove them. A git branch -d tags-tag name will probably remove them, but I'm concerned that this would also trigger git- svn to propagate the removal to our svn repository. How about this ? When I manage to remove these faulty branches, I can write up my experiences in the wiki in case others want to follow the same route. Geert ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Another gnucash git question
On Apr 30, 2011, at 9:36 AM, Geert Janssens wrote: On zaterdag 30 april 2011, John Ralls wrote: Don't add branches to refs/remotes anything. Hang your working branches off of your local mirror-branches (trunk and 2.4 if you have one; only trunk is made automatically) Can you help me understand why this is not done ? If I look with gitk, I now have a commit with four branches on it: refs/remotes/origin/trunk refs/remotes/trunk trunk bugfix (my working branch) But there is nothing suggesting that my working branch if based on trunk or refs/remotes/origin/trunk. For completeness, bugfix is not a tracking branch. It was simply created with git branch bugfix I don't know if this is correct, or if this branch should have been tracking trunk. Geert, You don't want local stuff in refs/remotes: Git uses those references to keep track of what's on the remote, and if you put local references there it will get confused. Working branches shouldn't be tracking branches. They should branch from tracking branches (which means that the parent of the root commit of the branch should be a commit on the tracking branch). By commit with 4 branches on it, I understand that you have a single commit with the names of those 4 branches in little boxes next to it on the timeline display. What that means is that that commit's SHA1is the HEAD reference for all 4 of those branches. Git-update rewrites the references in refs/remotes/branches to match those in refs/remotes/origin/branches. That's so that the git svn dcommit (on your system)-svn update (on my server)-git push(on my server, to github)- git pull origin (on your system) can work without getting confused. That means that the commits from your original git svn import are now accessible only from the working branches that you created. Once you rebase them from refs/remotes onto new branches in refs/heads, you can delete the branches in refs/remotes and run git prune and git repack -d. (Make a backup first and run git fsck --unreachable to see what's going to get deleted.) git svn log --oneline is a good check to make sure that the svn! side is synced up properly; if you get log output, all is well. If your bugfix branch has been merged back into trunk and dcommitted, then that's good, too. If bugfix has commits that haven't been merged, then something's wrong. You should run git fsck after you've gotten everything rebased to make sure that the repo is in good order. It would be wise to make frequent backups as well. Regards, John Ralls ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Another gnucash git question
On Apr 30, 2011, at 10:18 AM, Geert Janssens wrote: On zaterdag 30 april 2011, John Ralls wrote: You want to track refs/remotes/origin/2.4. The other ones are git-svn artifacts. Regards, John Ralls Ok thanks. I think I'm almost through now. There is one artifact still in my converted repo from how I originally imported the svn repo: I have a branch for each tag in svn. There were no actual tags at first sight, but I ran a git fetch -t origin This imported all tags as true tags. The tag-branches are still in the repo though and I would like to remove them. A git branch -d tags-tag name will probably remove them, but I'm concerned that this would also trigger git- svn to propagate the removal to our svn repository. How about this ? When I manage to remove these faulty branches, I can write up my experiences in the wiki in case others want to follow the same route. Geert, Yes, the tag branches are probably packed references from your original git svn import. You can look in your backup/.git/packed-refs (a text file) to make sure. I don't think that git-svn even knows how to delete branches from the svn repo, but you could delete one, then try git svn dcommit -n (dry run) to make sure it doesn't try to do something dumb. Regards, John Ralls ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: Gnucash 2.4.4.1/MacOS - chipcard import not available?
Hi again, after quite a while I now gave 2.4.5 a try and still face the same issue on the mac. Where would I place a chipcard.conf in the package and what would that file contain? cheers Peter Am 07.04.2011 um 22:58 schrieb Martin Preuss: Hi, I believe the reason is the missing chipcard.conf. In the next version I will make libchipcard just use some defaults if the config file can't be found, or even remove the need for that file entirely (since with current versions use of PC/SC is mandatory anyway and there is not much more to setup in the config file anymore). Regards Martin On Donnerstag 07 April 2011, Peter Sorowka wrote: After being busy with some other things i gave it another try and included the libchipcard file you send me in my libs folder. gnucash now crashes after stating loading plugin ddvcard regardless if the cardreader is attached or not. here ist what system console puts out on crash: 07.04.11 22:14:43 [0x0-0x2f02f0].org.gnucash.Gnucash[65038] Don't have write access to /Library 07.04.11 22:15:15 [0x0-0x2f02f0].org.gnucash.Gnucash[65038] Assertion failed: (cl), function LC_Client_Init, file client.c, line 393. 07.04.11 22:15:19 com.apple.launchd[177] ([0x0-0x2f02f0].org.gnucash.Gnucash[65038]) Exited abnormally: Abort trap the 22:14:43 message actually appears on start of gnucash. is that a hint? i attach the mac os crash report. cheers Peter -- Things are only impossible until they're not Martin Preuss - http://www2.aquamaniac.de/ AqBanking - http://www.aqbanking.de/ LibChipcard - http://www.libchipcard.de/ ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
