These patches are meant to go into 2.16.1. They are all connected to
issue2650 and separately resolve all the sub-issues. Some of these patches
were pulled from branch-2.14 which is why there are a few conflict
resolution patches, too.

12 patches for repository http://darcs.net/screened:

patch 8cc895e157a83e831923df67c86759ce8689cf45
Author: Ben Franksen <ben.franksen@online.de>
Date:   Mon Aug  3 12:48:22 CEST 2020
  * fix instance Show RepoProperty
  
  Since this instance is used to write the format file, too, we must not
  change the text of an unknown property. This resolves issue2650 insofar as
  from now on the format file won't be corrupted when we make the mistake of
  writing the format file before checking that the format allows us to modify
  the repo.

patch 3521bcb6a82943967e4ef30bb07a47861bedd43a
Author: Ben Franksen <ben.franksen@online.de>
Date:   Thu Aug  6 21:52:18 CEST 2020
  * resolve conflicts after 8cc895e157a83e

patch 2e4061668db4ca65d6d1bd984e61bc8ffef6ea40
Author: Ben Franksen <ben.franksen@online.de>
Date:   Thu Aug  6 14:23:11 CEST 2020
  * improve tests/repoformat.sh
  
  This adds tests for a rebase command (with both garbage and future repos).
  It also checks for issue2650 i.e. corruption of the format file.

patch 70af9242faea1bb5a5477f0e9b93624a0bde4d14
Author: Ben Franksen <ben.franksen@online.de>
Date:   Thu Aug  6 13:54:58 CEST 2020
  * adapt test scripts to changed format error messages

patch 9f8b603d77adc00ebe99d6af17b3013b0971b263
Author: Ben Franksen <ben.franksen@online.de>
Date:   Thu Aug  6 17:16:44 CEST 2020
  * tests/repoformat.sh: remove directories before creating them

patch 99ddb190be2ee8071ed04ec6347e71b1f5ff1239
Author: Ben Franksen <ben.franksen@online.de>
Date:   Thu Aug  6 21:41:49 CEST 2020
  * tests/repoformat.sh: test forward compatibility for all patch formats

patch e1f8ea67f4981bf9254f7bdcea279b53790a7a17
Author: Ben Franksen <ben.franksen@online.de>
Date:   Thu Aug  6 21:21:08 CEST 2020
  * add notes for 2.14.5 to CHANGELOG

patch a81c974a7cabac0f45d8937842db8face7256eff
Author: Ben Franksen <ben.franksen@online.de>
Date:   Thu Aug  6 21:41:13 CEST 2020
  * resolve conflicts after e1f8ea67f4981bf9254f

patch 2188b9a4b80e4ff4b4c095283595a57639afa4b2
Author: Ben Franksen <ben.franksen@online.de>
Date:   Thu Aug  6 13:45:06 CEST 2020
  * define path to lock file in D.R.Paths

patch 326c3a550148156477f145e4e0da5c676e7bdd5b
Author: Ben Franksen <ben.franksen@online.de>
Date:   Thu Aug  6 13:49:38 CEST 2020
  * fix: write the format file only if lock was taken
  
  This fixes yet another part of issue2650.

patch 91b3dd61ea232fd440cc90a40d072a2cea7d9a4c
Author: Ben Franksen <ben.franksen@online.de>
Date:   Mon Aug  3 15:08:06 CEST 2020
  * document the format file format and semantics

patch 1cd6a327b1e4313f2ba858b90fc3dfb6edd52cc2
Author: Ben Franksen <ben.franksen@online.de>
Date:   Thu Aug  6 10:45:21 CEST 2020
  * silently fix format entries broken by previous darcs versions
  
  This strips the prefix "Unknown format: " from any format property when
  reading the format file.

Attachments

• fix-instance-show-repoproperty.dpatch
• patch-preview.txt
• unnamed

> silently fix format entries broken by previous darcs versions

Do I recall correctly that we can end up with "Unknown format: Unknown 
format: ..."? If so I don't think this code handles that. I think it would 
also benefit from a couple of test cases (one with a single "Unknown format" 
and one with multiple ones if that is needed).

The rest of this bundle looks fine (of course I already looked at some of it 
in patch2088).

>> silently fix format entries broken by previous darcs versions
> 
> Do I recall correctly that we can end up with "Unknown format: Unknown 
> format: ..."? If so I don't think this code handles that. I think it would 
> also benefit from a couple of test cases (one with a single "Unknown format" 
> and one with multiple ones if that is needed).

Thanks, good point indeed. Will fix. Will also add tests.

Following up on review with an amended patch. Will screen this bundle now.

2 patches for repository http://darcs.net/screened:

patch 2e4061668db4ca65d6d1bd984e61bc8ffef6ea40
Author: Ben Franksen <ben.franksen@online.de>
Date:   Thu Aug  6 14:23:11 CEST 2020
  * improve tests/repoformat.sh
  
  This adds tests for a rebase command (with both garbage and future repos).
  It also checks for issue2650 i.e. corruption of the format file.

patch e788b3d62b7983e569f6a1fc197d658cb4d4b74f
Author: Ben Franksen <ben.franksen@online.de>
Date:   Thu Aug  6 10:45:21 CEST 2020
  * silently fix format entries if broken by previous darcs versions (issue2650)
  
  This strips the prefix "Unknown format: " (as often as it is found) from any
  format property when reading the format file. Also test that repoformat
  compatibility rules are not affected by this particular kind of corruption.

Attachments

• improve-tests_repoformat_sh.dpatch
• patch-preview.txt
• unnamed

Ganesh, could you take a final look over patch 
e788b3d62b7983e569f6a1fc197d658cb4d4b74f before I self-accept it?

> Ganesh, could you take a final look over patch 
> e788b3d62b7983e569f6a1fc197d658cb4d4b74f before I self-accept it

Looks fine.