/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 notes/roundtripping.txt

  • Committer: Martin Pool
  • Date: 2005-06-06 04:17:53 UTC
  • Revision ID: mbp@sourcefrog.net-20050606041753-abe590daf0d7f959
Updated merge patch from Aaron

This patch contains all the changes to merge that I'd like to get into
0.5, namely
* common ancestor BASE selection
* merge reports conflicts when they are encountered
* merge refuses to operate in working trees with changes
* introduces revert command to revert the working tree to the
last-committed state
* Adds some reasonable help text

Show diffs side-by-side

added added

removed removed

Lines of Context:
notes/roundtripping.txt
1
 
Bzr revision metadata that doesn't exist in git:
2
 
 
3
 
 - revision ids
4
 
 - revision properties
5
 
 - ghost parents
6
 
 - file ids
7
 
  * git-sha+path -> fileid mapping
8
 
 
9
 
refs/bzr/<revid> refs to be able to find Git revisions based on Bazaar revision
10
 
ids.