Re: polyorb package building

To: debian-ada@lists.debian.org
Subject: Re: polyorb package building
From: Xavier Grave <xavier.grave@ipno.in2p3.fr>
Date: Wed, 01 Jun 2011 13:28:01 +0200
Message-id: <[🔎] 4DE62241.2050206@ipno.in2p3.fr>
In-reply-to: <[🔎] 4DE5F7D6.8010309@ipno.in2p3.fr>
References: <[🔎] 4DE5F7D6.8010309@ipno.in2p3.fr>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Le 01/06/2011 10:27, Xavier Grave a écrit :
> Hi,
> 
> 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
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk3mIj0ACgkQVIZi0A5BZF72AACeIfseBhwK/lDNkcUkOkAdR60M
FAgAoLkxZSSlg4ogjmVYNN41K8ygltsa
=8tfq
-----END PGP SIGNATURE-----

Reply to:

Follow-Ups:
- Re: polyorb package building
  - From: Ludovic Brenta <ludovic@ludovic-brenta.org>

References:
- polyorb package building
  - From: Xavier Grave <xavier.grave@ipno.in2p3.fr>

Prev by Date: polyorb package building
Next by Date: Re: polyorb package building
Previous by thread: polyorb package building
Next by thread: Re: polyorb package building
Index(es):
- Date
- Thread