Bug#842614: Bug#842608: dgit pull should bail out in splitbrain mode

Control: clone -1 -2 Control: retitle -2 problem with --quilt=gbp, maybe .gitignore .pc Control: severity -2 normal Control: tags -2 + moreinfo Control: submitter -2 Felipe Sateler Felipe, whatever is going on here is nothing to do with `dgit pull', I think. At least, I

Bug#842614: Bug#842608: dgit pull should bail out in splitbrain mode

Felipe Sateler writes ("Bug#842614: Bug#842608: dgit pull should bail out in splitbrain mode"): > But the clash between the upstream gitignore and the debian one breaks dgit. > > Or at least that's what I think it happened when I tried to use dgit. As I > said > in my

Bug#842614: Bug#842608: dgit pull should bail out in splitbrain mode

On Jun 21, 2017 08:03, "Sean Whitton" wrote: Hello Felipe, On Tue, Jun 20, 2017 at 09:30:44PM -0400, Felipe Sateler wrote: > Currently dgit is not really usable with gbp -managed repositories, as > many will have a .gitignore file ignoring the .pc dir. Note that dgit

Bug#842614: Bug#842608: dgit pull should bail out in splitbrain mode

Hello Felipe, On Tue, Jun 20, 2017 at 09:30:44PM -0400, Felipe Sateler wrote: > Currently dgit is not really usable with gbp -managed repositories, as > many will have a .gitignore file ignoring the .pc dir. Note that dgit does not commit the .pc dir to git, so this should work fine. -- Sean

Bug#842614: Bug#842608: dgit pull should bail out in splitbrain mode

gitOn Sun, 30 Oct 2016 20:09:24 + Ian Jackson < ijack...@chiark.greenend.org.uk> wrote: > Control: clone -1 -2 > Control: retitle -2 dgit pull should do "the right thing" in split brain mode > Control: severity -2 wishlist > > In split brain mode, dgit pull should merge the right bits. > > For

Bug#842608: dgit pull should bail out in splitbrain mode

Control: clone -1 -2 Control: retitle -2 dgit pull should do "the right thing" in split brain mode Control: severity -2 wishlist In split brain mode, dgit pull should merge the right bits. For example, with --gbp, it should merge debian/patches, and any upstream .gitignores, and leave the rest

Bug#842608: dgit pull should bail out in splitbrain mode

Package: dgit Version: 2.8 Severity: normal Since all the other dgit commands work in splitbrain mode if you pass (e.g.) --gbp, a user might expect dgit pull to DTRT. Since it won't, it should exit with an error in splitbrain mode. -- System Information: Debian Release: stretch/sid APT