← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/unrelated-merge.txt

  • Committer: Vincent Ladeuil
  • Date: 2009-12-10 12:31:39 UTC
  • mto: (4901.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4902.
  • Revision ID: v.ladeuil+lp@free.fr-20091210123139-n8mgml3nid1the59
Cleanup and NEWS entry.

* bzrlib/ui/text.py:
(TextProgressView._show_line): Stop caching terminal width.

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'