← Back to branch summary

~ubuntu-branches/ubuntu/lucid/bzr/lucid-proposed

« back to all changes in this revision

Viewing changes to doc/unrelated-merge.txt

  • Committer: Bazaar Package Importer
  • Author(s): Jeff Bailey
  • Date: 2006-03-20 08:31:00 UTC
  • mfrom: (1.1.2 upstream)
  • mto: This revision was merged to the branch mainline in revision 4.
  • Revision ID: james.westby@ubuntu.com-20060320083100-ovdi2ssuw0epcx8s
Tags: 0.8~200603200831-0ubuntu1
* Snapshot uploaded to Dapper at Martin Pool's request.

* Disable testsuite for upload.  Fakeroot and the testsuite don't
  play along.

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'