~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to README_BDIST_RPM

  • Committer: Martin Pool
  • Date: 2006-03-24 19:11:33 UTC
  • mto: This revision was merged to the branch mainline in revision 1626.
  • Revision ID: mbp@sourcefrog.net-20060324191133-4f45292db5c5d487
(weave-merge) don't treat killed-both lines as points of agreement; 
makes sure that killed-[ab] lines next to change reasons aren't 
omitted from conflict descriptions.

Add more weave merge tests about line deletion.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
There is a bug in disttools for distributions who's rpmbuild compresses 
2
 
the man pages. This causes an error building the final packages as it's 
3
 
expecting bzr.1 and not finding it, but finding bzr.1.gz that's unpackaged.
4
 
 
5
 
This bug is known to affect Fedora, RHEL, and Centos distributions.
6
 
 
7
 
There is a preliminary patch at http://bugs.python.org/issue644744 that
8
 
fixes this issue with disttools.