Merge remote-tracking branch 'origin/reshard' into next

* origin/reshard:
  xcpdb: support resharding v2 repos
  xcpdb: use destination shard as progress prefix
  xapcmd: preserve indexlevel based on the destination
  v2writable: use a smaller default for Xapian partitions

diff --cc MANIFEST
index ae637f24aa91f1d7e569e4f798348102d8bc462f,a750e09e0661b84ac94cb0e434b6424875a86c3d..3f0a79a671113b6f7722dcd81b67aa451015f7d9
--- 1/MANIFEST
--- 2/MANIFEST
+++ b/MANIFEST
@@@ -263,4 -258,4 +263,5 @@@ t/view.
  t/watch_filter_rubylang.t
  t/watch_maildir.t
  t/watch_maildir_v2.t
 +t/www_listing.t
+ t/xcpdb-reshard.t

diff --cc lib/PublicInbox/V2Writable.pm
Simple merge