← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/unrelated-merge.txt

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-11-15 14:47:59 UTC
  • mfrom: (2984.1.1 update_basis_161131)
  • Revision ID: pqm@pqm.ubuntu.com-20071115144759-zx0nd44rgp38riwr
(John Arbash Meinel) Fix bug #161131: when exactly 2 items were
        deleted, it would remove all items in a directory.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/unrelated-merge.txt
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'