/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/git-serve.txt

  • Committer: John Arbash Meinel
  • Date: 2009-04-29 17:02:36 UTC
  • mto: This revision was merged to the branch mainline in revision 4322.
  • Revision ID: john@arbash-meinel.com-20090429170236-v1oe7b235mi73cqs
https://launchpad.net/bugs/328171
Add a per-implementation test that deleting lines conflicts with modifying lines.

At the moment, I don't see a simple way to implement this for LCA merge,
so I'm just marking it as 'expectedFailure'.
However, it works for both Weave merge and for Merge3.
Fixes bug #328171

Show diffs side-by-side

added added

removed removed

Lines of Context:
notes/git-serve.txt
1
 
Git serve
2
 
 
3
 
Todo:
4
 
 
5
 
 * Fix the pack creation code in Dulwich. It doesn't generate deltas quite 
6
 
   well at the moment.
7
 
 
8
 
 * Switch to the new pack-based format once John's work on PackCollections 
9
 
   is finished. This should give very nice performance improvements, 
10
 
   in particular the caching of Trees.
11
 
 
12
 
 * Support using the cached trees in BazaarObjectStore.generate_pack_contents,
13
 
   rather than calling out to _revision_to_objects as the latter is slow
14
 
   (it uses inventories).
15
 
 
16
 
 * Support roundtripping