~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/unrelated-merge.txt

  • Committer: Martin Pool
  • Date: 2005-05-16 04:32:21 UTC
  • Revision ID: mbp@sourcefrog.net-20050516043221-12a9da66feb5d67b
clean up stat cache code:
- smarter UTF-8 and quopri encoding of file names
- check paths are not duplicated in cache
- check lines are well-formed
- more docs

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
****************************
 
2
Merging unrelated changesets
 
3
****************************
 
4
 
 
5
It ought to be possible to merge in even totally unrelated changesets,
 
6
by just treating them as patches.  It is possible that the file ids
 
7
will mismatch, in which case we could perhaps assume the filenames are
 
8
compatible. 
 
 
b'\\ No newline at end of file'