Rev 6414: Merge trunk resolving conflicts in file:///home/vila/src/bzr/experimental/cached-branch-store/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/cached-branch-store/

------------------------------------------------------------
revno: 6414 [merge]
revision-id: v.ladeuil+lp at free.fr-20120105175630-kp0kt0el27s40q0x
parent: v.ladeuil+lp at free.fr-20120105155744-bkdwm8shf5zd2zcf
parent: pqm at pqm.ubuntu.com-20120105174644-3in053mac5now0up
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: cached-branch-store
timestamp: Thu 2012-01-05 18:56:30 +0100
message:
  Merge trunk resolving conflicts
removed:
  bzrlib/util/effbot/            effbot-20050627013916-8e7588a4b6d6dcf7
  bzrlib/util/effbot/__init__.py __init__.py-20050627013916-18153e1d0b7b7a0c
  bzrlib/util/effbot/org/        org-20050627013916-965d91896868d971
  bzrlib/util/effbot/org/__init__.py __init__.py-20050627013916-e40f412dbfb503e7
  bzrlib/util/effbot/org/gzip_consumer.py gzip_consumer.py-20050627013916-24d64dcef809665b
  bzrlib/util/effbot/org/http_client.py http_client.py-20050627013916-44f3badc529d9afd
  bzrlib/util/effbot/org/http_manager.py http_manager.py-20050627013916-3e8eea2435bddb3a
  bzrlib/util/elementtree/       elementtree-20050323061618-ec49a4621bc7e4f4
  bzrlib/util/elementtree/ElementTree.py ElementTree.py-20050323061623-cfa8eefe86f35391
  bzrlib/util/elementtree/__init__.py __init__.py-20050323061623-61888e93152e298d
  tools/http_client.py           http_client.py-20050819224207-b29be8324c55b359
modified:
  bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
  bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
  bzrlib/tests/blackbox/test_bound_branches.py test_bound_branches.py-20051109215527-2373188ad566c205
  bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
  bzrlib/tests/blackbox/test_cat.py test_cat.py-20051201162916-f0937e4e19ea24b3
  bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
  bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
  bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
  bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
  bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
  bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
  bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
  bzrlib/tests/blackbox/test_nick.py test_nick.py-20061105141046-p7zovcsit44uj4w9-1
  bzrlib/tests/blackbox/test_pack.py test_pack.py-20070712120702-0c7585lh56p894mo-1
  bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
  bzrlib/tests/blackbox/test_remerge.py test_remerge.py-20060629162739-o9m3s6143v8jnr2y-1
  bzrlib/tests/blackbox/test_remove_tree.py test_remove_tree.py-20061110192919-5j3xjciiaqbs2dvo-1
  bzrlib/tests/blackbox/test_revision_history.py test_revision_history.py-20060530150249-i2szwjr5uioe9ujb-1
  bzrlib/tests/blackbox/test_versioning.py versioning.py-20050622071821-3ddf5e2e5e93c602
  bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
  bzrlib/tests/test_server.py    test_server.py-20100209163834-im1ozfuenfmqaa2m-1
  bzrlib/tests/test_uncommit.py  test_uncommit.py-20080316104338-y3gxu67g5m2qih10-1
  bzrlib/tests/test_urlutils.py  test_urlutils.py-20060502192900-46b1f9579987cf9c
  bzrlib/tests/test_whitebox.py  whitebox.py-20050530064534-a063aafb4a0a3a04
  bzrlib/uncommit.py             uncommit.py-20050626215513-5ec509fa425b305c
  bzrlib/xml_serializer.py       xml.py-20050309040759-57d51586fdec365d
  doc/en/release-notes/bzr-2.5.txt bzr2.5.txt-20110708125756-587p0hpw7oke4h05-1
-------------- next part --------------

Diff too large for email (4626 lines, the limit is 1000).