From kreckel at ginac.de Wed Dec 12 00:02:59 2007 From: kreckel at ginac.de (Richard B. Kreckel) Date: Wed, 12 Dec 2007 00:02:59 +0100 Subject: [GiNaC-devel] Branch or HEAD? Message-ID: <475F1723.5070507@ginac.de> Jens, Is GiNaC-1.4 branched already? I just tried to commit something to numeric.cpp in 1.4 and 1.5, and in 1.5 I got Up-to-date check failed for `numeric.cpp'. Both appear to refer to the same version. I'm confused because mentions the branch. Cheers -richy. PS: Unfortunately, git is not part of the Linux distribution running on www.ginac.de. I'ld have to compile it manually... :-( -- Richard B. Kreckel From varg at theor.jinr.ru Wed Dec 12 08:44:00 2007 From: varg at theor.jinr.ru (Alexei Sheplyakov) Date: Wed, 12 Dec 2007 10:44:00 +0300 Subject: [GiNaC-devel] Branch or HEAD? In-Reply-To: <475F1723.5070507@ginac.de> References: <475F1723.5070507@ginac.de> Message-ID: <20071212074400.GA19598@theor.jinr.ru> Hello, On Wed, Dec 12, 2007 at 12:02:59AM +0100, Richard B. Kreckel wrote: > Is GiNaC-1.4 branched already? Yes. The are some commits which touch only master (a.k.a. HEAD) branch, see http://159.93.129.199/gitweb.cgi?p=ginac.git;a=commitdiff_plain;h=a5196f57af6539d8a25a866ad9cf8d836dd8e3df Best regards, Alexei -- All science is either physics or stamp collecting. -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 827 bytes Desc: Digital signature URL: From kreckel at ginac.de Wed Dec 12 22:31:12 2007 From: kreckel at ginac.de (Richard B. Kreckel) Date: Wed, 12 Dec 2007 22:31:12 +0100 Subject: [GiNaC-devel] Branch or HEAD? In-Reply-To: <20071212074400.GA19598@theor.jinr.ru> References: <475F1723.5070507@ginac.de> <20071212074400.GA19598@theor.jinr.ru> Message-ID: <47605320.2000506@ginac.de> Alexei Sheplyakov wrote: >> Is GiNaC-1.4 branched already? > > Yes. The are some commits which touch only master (a.k.a. HEAD) branch, > see > > http://159.93.129.199/gitweb.cgi?p=ginac.git;a=commitdiff_plain;h=a5196f57af6539d8a25a866ad9cf8d836dd8e3df I check out GiNaC with no -r flag from CVS and compare that to ginac-1.4.1 released three weeks ago. The link above contains several patches. But: The one for add.cpp is applied in both versions, the one for power.h is applied to the CVS version only. That is confusing. Oh, well. I want to make sure that a patch I just made will get into releases 1.4.2 and 1.5.0. Can someone please tell me how I can accomplish that? Confused -richy. -- Richard B. Kreckel From varg at theor.jinr.ru Thu Dec 13 07:25:22 2007 From: varg at theor.jinr.ru (Alexei Sheplyakov) Date: Thu, 13 Dec 2007 09:25:22 +0300 Subject: [GiNaC-devel] Re: Branch or HEAD? In-Reply-To: <47605320.2000506@ginac.de> References: <475F1723.5070507@ginac.de> <20071212074400.GA19598@theor.jinr.ru> <47605320.2000506@ginac.de> Message-ID: <20071213062522.GA5239@theor.jinr.ru> Hi! On Wed, Dec 12, 2007 at 10:31:12PM +0100, Richard B. Kreckel wrote: > I check out GiNaC with no -r flag from CVS and compare that to > ginac-1.4.1 released three weeks ago. The link above contains several > patches. But: The one for add.cpp is applied in both versions, the one > for power.h is applied to the CVS version only. That is confusing. The patch to power.h (and power.cpp) breaks ABI, so it was not applied to the stable (1.4) branch. > Oh, well. I want to make sure that a patch I just made will get into > releases 1.4.2 and 1.5.0. I've applied your patch to master, ginac_1-4 and ginac_1-3 branches, see http://159.93.129.199/gitweb.cgi?p=ginac.git;a=commit;h=2ba3a7625b322bdd07dfae38a9a3843ac1df1461 http://159.93.129.199/gitweb.cgi?p=ginac.git;a=commit;h=bb142344dc7b1e83a29c0def029dc78a7bdabd77 http://159.93.129.199/gitweb.cgi?p=ginac.git;a=commit;h=5ba3a7090e4f0a9f1dc88088379e734240ffa2fe > Can someone please tell me how I can accomplish that? That's kind of already done. If you still insist on commiting them into CVS, the following information might be useful. The patch did not apply cleanly to ginac_1-4 branch (although it applied just fine to master and ginac_1-3): $ git-am patches/0001-Fix-GCC-4.3-compilation-issue-by-removing-storage.patch Applying * Fix GCC 4.3 compilation issue by removing storage class of function coerce specializations [C++98 7.1.1-1]. error: patch failed: ginac/numeric.cpp:408 error: ginac/numeric.cpp: patch does not apply Patch failed at 0001. When you have resolved this problem run "git-am --resolved". If you would prefer to skip this patch, instead run "git-am --skip". Apparently the reason was some whitespace damage in numeric.cpp (in the ginac_1-4 branch). May be you've got the same problem? Best regards, Alexei -- All science is either physics or stamp collecting. -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 827 bytes Desc: Digital signature URL: From kreckel at ginac.de Thu Dec 13 21:26:18 2007 From: kreckel at ginac.de (Richard B. Kreckel) Date: Thu, 13 Dec 2007 21:26:18 +0100 Subject: [GiNaC-devel] Re: Branch or HEAD? In-Reply-To: <20071213062522.GA5239@theor.jinr.ru> References: <475F1723.5070507@ginac.de> <20071212074400.GA19598@theor.jinr.ru> <47605320.2000506@ginac.de> <20071213062522.GA5239@theor.jinr.ru> Message-ID: <4761956A.4050705@ginac.de> Alexei Sheplyakov wrote: >> Oh, well. I want to make sure that a patch I just made will get into >> releases 1.4.2 and 1.5.0. > > I've applied your patch to master, ginac_1-4 and ginac_1-3 branches, see > > http://159.93.129.199/gitweb.cgi?p=ginac.git;a=commit;h=2ba3a7625b322bdd07dfae38a9a3843ac1df1461 > http://159.93.129.199/gitweb.cgi?p=ginac.git;a=commit;h=bb142344dc7b1e83a29c0def029dc78a7bdabd77 > http://159.93.129.199/gitweb.cgi?p=ginac.git;a=commit;h=5ba3a7090e4f0a9f1dc88088379e734240ffa2fe > >> Can someone please tell me how I can accomplish that? > > That's kind of already done. If you still insist on commiting them > into CVS, the following information might be useful. After a fresh checkout it worked. I should've done that earlier. Well, thanks a lot, anyway. Cheers -richy. -- Richard B. Kreckel