Re: polyorb package building
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Le 01/06/2011 14:27, Ludovic Brenta a écrit :
>
> Xavier Grave wrote:
>>> com.adacore.polyorb 6bd812bfb6d2f1416aa33680e77145fa06870ffb introduces
>>> features-2.8 so I propose to use
>>> f2f35ec9a9dbf1cd02430ae5cd2148ed8fb2e4af as a 2.7 version for
> packaging.
>>
>> I meet minor conflict resolution problem when I try to merge
>> f2f35ec9a9dbf1cd02430ae5cd2148ed8fb2e4af and
>> 40972ea60a0e6465df334a3112a183c47ee07e02
>>
>> But when I try to merge the result of these merge with
>> 5454b08cc440e45eb46fe19044a15cffec5d283b it become quite complicate for
>> my knowledge of monotone.
>>
>> Any help, advices welcome :)
>> xavier
>
> First, do you really have to merge 5454b08 (aka t:polyorb-2.6.0~20090423)
> with 40972e? You could simply suspend t:polyorb-2.6.0~20090423 and package
> the other head instead.
I knew I was missing something, thanks for the suspend hint.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iEYEARECAAYFAk3mPYgACgkQVIZi0A5BZF78ugCgkSKFGiDZq7ZW2vDlskePFt/8
vrAAn2ZqQukFWFcKCqhm5EoWhXGY7sq3
=AICl
-----END PGP SIGNATURE-----
Reply to: