[GiNaC-devel] Re: Branch or HEAD?

[Alexei Sheplyakov]

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: <http://www.ginac.de/pipermail/ginac-devel/attachments/20071213/0ac1ab0d/attachment.sig>