[prev in list] [next in list] [prev in thread] [next in thread] 

List:       netfilter-devel
Subject:    Re: Tag for 1.4.3 missing
From:       Jan Engelhardt <jengelh () medozas ! de>
Date:       2009-03-30 10:20:36
Message-ID: alpine.LSU.2.00.0903301219380.23541 () fbirervta ! pbzchgretzou ! qr
[Download RAW message or body]

On Monday 2009-03-30 12:03, Pablo Neira Ayuso wrote:
>> Graphing reveals where it went:
>> 
>> $ git-forest -a --sha --all
>> [...]
>> ├ (Peter Volkov) libxtables: fix compile error due to incomplete change──
>> ├ (Jan Engelhardt) iptables-save: minor corrections to the manpage markup
>> │ ┌─[v1.4.3]──(Patrick McHardy) Bump version to 1.4.3──(3fb2e4a)
>> ├─┘
>> ├ (Jesper Dangaard Brouer) libiptc: give credits to my self──(c9477d0)
>> ├ (Jesper Dangaard Brouer) libiptc: fix whitespaces and typos──(a9fe5b3)
>> [...]
>> 
>> There is also the missing version bump you noticed. Having the same
>> author date as the 1.4.3 release I simply suspect the tag and master
>> were not pushed previously.
>
>Indeed, I suspected something like that.
>
>> `git merge -s ours 3fb2e4a` should be solving that in the most nicest
>> manner I am aware of.
>
>That change must be on Patrick's however that may conflict with my bump
>from 1.4.3-rc1 to 1.4.3.1?

Hence the "-s ours".
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]