Bug#698222: git-import-dsc: does not merge already-imported upstream version

On Tue, Jan 15, 2013 at 10:56:27AM -0500, Mike Miller wrote: > On Tue, Jan 15, 2013 at 10:15 AM, Guido Günther wrote: > > On Tue, Jan 15, 2013 at 08:43:59AM -0500, Mike Miller wrote: > >> I found the following steps do not work: > >> > >> git-import-orig --no-merge ../foo_1.2.orig.tar.gz > >> git-i

Bug#698222: git-import-dsc: does not merge already-imported upstream version

On Tue, Jan 15, 2013 at 10:15 AM, Guido Günther wrote: > On Tue, Jan 15, 2013 at 08:43:59AM -0500, Mike Miller wrote: >> I found the following steps do not work: >> >> git-import-orig --no-merge ../foo_1.2.orig.tar.gz >> git-import-dsc ../foo_1.2-1.dsc >> >> The resulting debian/1.2-1 commit is a c

Bug#698222: git-import-dsc: does not merge already-imported upstream version

On Tue, Jan 15, 2013 at 08:43:59AM -0500, Mike Miller wrote: > Package: git-buildpackage > Version: 0.6.0~git20121124 > Severity: wishlist > > I found the following steps do not work: > > git-import-orig --no-merge ../foo_1.2.orig.tar.gz > git-import-dsc ../foo_1.2-1.dsc > > The resulting debian

Bug#698222: git-import-dsc: does not merge already-imported upstream version

Package: git-buildpackage Version: 0.6.0~git20121124 Severity: wishlist I found the following steps do not work: git-import-orig --no-merge ../foo_1.2.orig.tar.gz git-import-dsc ../foo_1.2-1.dsc The resulting debian/1.2-1 commit is a child of only master, it does not properly merge upstream/1.2