gitOn Sun, 30 Oct 2016 20:09:24 +0000 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 example, with --gbp, it should merge debian/patches, and any > upstream .gitignores, and leave the rest of the tree alone.
Indeed. While at it, the error message could be improved. This is unparseable: dgit: split brain (separate dgit view) may be needed (--quilt=gbp). dgit: base trees orig=d510ca798480f37fc567 o+d/p=5c8951c97cef58952a93 dgit: quilt differences: src: ## orig ## gitignores: == orig == dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p dgit: --quilt=gbp specified, implying patches-unapplied git tree dgit: but git tree differs from orig in upstream files. Currently dgit is not really usable with gbp -managed repositories, as many will have a .gitignore file ignoring the .pc dir. Saludos
