[Dctrl-tools-devel] [SCM] Debian control file query tools branch, maint-2.20, updated. 2.20-15-g952ecbf

[David Prévot]

Hi Antti-Juhani,

Le 08/12/2011 02:44, Antti-Juhani Kaijanaho a écrit :
> On Wed, Dec 07, 2011 at 09:25:25PM +0000, David Prévot wrote:
>>     Merge branch 'master' into maint-2.20
> 
> Normally, that'd be a bad idea, but it was benign here.
> 
> But just to make sure it's clear

Thanks a lot for the detailed explanation.

> Normally, one would use
> cherry-pick to copy stuff selectively from master to maint-x.y.

Right, this way it will always work (even not in the specific case were
there was only translation stuff on master).

Regards

David

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: OpenPGP digital signature
URL: <http://lists.alioth.debian.org/pipermail/dctrl-tools-devel/attachments/20111208/2bee6bca/attachment.pgp>