On Thu, May 22, 2008 at 04:11:20PM +0200, Matej Vela wrote:
> I've been mulling this over, and I think the answer is to treat the
> Debian branch as definitive, i.e. merge with strategy "ours". After
> all, any conflicts must have been resolved by the packager, and the
> Debian patch is a result o
tag 475571 patch
thanks
Guido Günther <[EMAIL PROTECTED]> writes:
> On Fri, Apr 11, 2008 at 08:32:05PM +0200, Matej Vela wrote:
>> -- I get two disjointed branches:
>>
>> o---o---o <-- upstream
>> \
>> o---o---o <-- master
>
> This is the only sane thing we can do, since we can'
Hi Matej,
On Fri, Apr 11, 2008 at 08:32:05PM +0200, Matej Vela wrote:
[..snip..]
> -- I get two disjointed branches:
>
> o---o---o <-- upstream
> \
> o---o---o <-- master
This is the only sane thing we can do, since we can't be sure upstream has
merge conflicts with master (if yo
Package: git-buildpackage
Version: 0.4.22
Severity: wishlist
If I call git-import-dsc for several versions successively --
~$ git-import-dsc python-ldap_2.3.1-1.dsc
~$ cd python-ldap
~/python-ldap$ git-import-dsc ../python-ldap_2.3.3-1.dsc
~/python-ldap$ git-import-dsc ../python-l
4 matches
Mail list logo
