← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/unrelated-merge.txt

  • Committer: Martin Pool
  • Date: 2005-09-13 05:11:27 UTC
  • Revision ID: mbp@sourcefrog.net-20050913051127-47c500210200a219
- branch now tracks ancestry - all merged revisions

 - new Branch.get_ancestry() returns them as a list

 - basic test for this

 - commit appends to ancestry (only for non-merge commits)
 
 - clean up imports

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'