chiark / gitweb /
~ianmdlvl / dgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 71350fe) | patch
Split brain: Start introducing gbp (split brain) quilt mode
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 4 Jun 2016 14:25:23 +0000 (15:25 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jul 2016 15:47:47 +0000 (16:47 +0100)
commite5b0f5ddd4130e408391839bc9512eac55e38808
tree9d37d1eee88d5f37008d633410862456725bb1d5tree | snapshot
parent71350fe30f7449b24dc2884b42cc5ff50a2bf84ecommit | diff
Split brain: Start introducing gbp (split brain) quilt mode

* Replace quilt_could_gbp with new calculation based on three calls to
  quiltify_trees_differ.

* Reworked messages about quilt differences.

* Start to provide the `gbp', `apply' and `dpm' quilt modes.
  Currently we crash with a die if any of these are used.
  Nevertheless, we allow `gbp' and `apply' to be specified.
dgit diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.