/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to doc/unrelated-merge.txt

  • Committer: Martin Pool
  • Date: 2005-05-11 04:18:51 UTC
  • Revision ID: mbp@sourcefrog.net-20050511041851-a0a7480c958ef86c
- new testing command compare-trees
- change operation of TreeDelta object a bit
  to specify which renamed files also have modified text
- new TreeDelta.show() factored out
- new compare_trees similar to compare_inventories
  but handling WorkingTrees that don't have a SHA-1 
  in the inventory but can get it from cache
- new Inventory.get_file_kind

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'