/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/developers/integration.txt

  • Committer: John Arbash Meinel
  • Date: 2010-01-12 20:51:58 UTC
  • mto: (4634.119.5 2.0)
  • mto: This revision was merged to the branch mainline in revision 4959.
  • Revision ID: john@arbash-meinel.com-20100112205158-ka4r62tpmtf3aglg
https://launchpad.net/bugs/504390
Fix a bug in the dirstate logic for 'set_path_id'.

It was a bit tricky to sort out, because it depends on the sort order
of sets. Basically 'set_path_id' was accidentally adding the old
file-id a a location to get the entry for the new file-id.
And then the _get_entry lookup would see that the entry was
absent in the given tree (because it doesn't validate that the
file-id for the entry line actually matches the file-id supplied).

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/developers/integration.txt
197
197
 
198
198
  from bzrlib import branch
199
199
 
200
 
  b = branch.Branch.open('http://bazaar.launchpad.net/~bzr-pqm/bzr/bzr.dev')
 
200
  b = branch.Branch.open('http://bazaar-vcs.org/bzr/bzr.dev')
201
201
  nb = b.bzrdir.sprout('/tmp/newBzrBranch').open_branch()
202
202
 
203
203
 
213
213
  from bzrlib import branch
214
214
 
215
215
  b1 = branch.Branch.open('file:///home/user/mybranch')
216
 
  b2 = branch.Branch.open('http://bazaar.launchpad.net/~bzr-pqm/bzr/bzr.dev')
 
216
  b2 = branch.Branch.open('http://bazaar-vcs.org/bzr/bzr.dev')
217
217
  b1.push(b2)
218
218
 
219
219