~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/unrelated-merge.txt

  • Committer: Aaron Bentley
  • Date: 2007-12-20 20:44:45 UTC
  • mto: This revision was merged to the branch mainline in revision 3235.
  • Revision ID: abentley@panoramicfeedback.com-20071220204445-9o2f10gvvd8e4rks
Implement hard-link support for branch and checkout

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'