Rev 262: Merge from upstream. in http://people.samba.org/bzr/jelmer/bzr-svn/bzr.dev

Jelmer Vernooij jelmer at samba.org
Thu Dec 28 02:27:32 GMT 2006


------------------------------------------------------------
revno: 262
revision-id: jelmer at samba.org-20061228022606-pl02194x4z5n0zx3
parent: jelmer at samba.org-20061228021810-6k8pvr2djgzj1xmy
parent: jelmer at samba.org-20061227180657-d11m7tlyad4d4bpa
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: norootid
timestamp: Thu 2006-12-28 03:26:06 +0100
message:
  Merge from upstream.
added:
  errors.py                      errors.py-20061226172623-w1sbj8ynpo0eojqp-1
modified:
  README                         README-20051120210643-bd274a2fef9aed6a
  __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
  branch.py                      svnbranch.py-20051017135706-11c749eb0dab04a7
  branchprops.py                 branchprops.py-20061223204623-80lvm7pjrpsgk0dd-1
  convert.py                     svn2bzr.py-20051018015439-cb4563bff29e632d
  fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
  fileids.py                     fileids.py-20060714013623-u5iiyqqnko11grcf-1
  logwalker.py                   logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
  mapping.txt                    mapping.txt-20060625151311-9ghaqrm71ajq593n-1
  repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
  scheme.py                      scheme.py-20060516195850-95181aae6b272f9e
  tests/test_branchprops.py      test_branchprops.py-20061223210444-04xf5224zcg69m3w-1
  tests/test_convert.py          test_convert.py-20060705203611-b1l0bapeku6foco0-1
  tests/test_logwalker.py        test_logwalker.py-20060622141944-pkocc3rj8g62ukbi-1
  tests/test_repos.py            test_repos.py-20060508151940-ddc49a59257ca712
  tests/test_scheme.py           test_scheme.py-20060621221855-va2xabhlxpmc9llx-1
  tests/test_transport.py        test_transport.py-20060621232111-xh7xvoblzsrgj79t-1
  transport.py                   transport.py-20060406231150-b3472d06b3a0818d
  tree.py                        tree.py-20060624222557-dudlwqcmkf22lt2s-1
    ------------------------------------------------------------
    revno: 236.1.11.1.71
    merged: jelmer at samba.org-20061227180657-d11m7tlyad4d4bpa
    parent: jelmer at samba.org-20061227051119-xc3dfwjrajs93um3
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Wed 2006-12-27 19:06:57 +0100
    message:
      Use original specified repository url.
    ------------------------------------------------------------
    revno: 236.1.11.1.70
    merged: jelmer at samba.org-20061227051119-xc3dfwjrajs93um3
    parent: jelmer at samba.org-20061227042119-q98xp1i0u725mj4z
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Wed 2006-12-27 06:11:19 +0100
    message:
      Fix default handling.
    ------------------------------------------------------------
    revno: 236.1.11.1.69
    merged: jelmer at samba.org-20061227042119-q98xp1i0u725mj4z
    parent: jelmer at samba.org-20061227034807-w9dva17y9ao13c2z
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Wed 2006-12-27 05:21:19 +0100
    message:
      Try to reduce memory usage further.
      Move mutters about commands sent to server to single place.
    ------------------------------------------------------------
    revno: 236.1.11.1.68
    merged: jelmer at samba.org-20061227034807-w9dva17y9ao13c2z
    parent: jelmer at samba.org-20061227030523-zbw1bndpbqprkd3e
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Wed 2006-12-27 04:48:07 +0100
    message:
      Handle children in replaced dirs more gracefully.
    ------------------------------------------------------------
    revno: 236.1.11.1.67
    merged: jelmer at samba.org-20061227030523-zbw1bndpbqprkd3e
    parent: jelmer at samba.org-20061227002159-777owqcr37aji4kv
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Wed 2006-12-27 04:05:23 +0100
    message:
      Fix nested replace bug.
    ------------------------------------------------------------
    revno: 236.1.11.1.66
    merged: jelmer at samba.org-20061227002159-777owqcr37aji4kv
    parent: jelmer at samba.org-20061226233735-g1nn2zjwz9kf2v3u
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Wed 2006-12-27 01:21:59 +0100
    message:
      Supporting copying directories from non-branch paths.
    ------------------------------------------------------------
    revno: 236.1.11.1.65
    merged: jelmer at samba.org-20061226233735-g1nn2zjwz9kf2v3u
    parent: jelmer at samba.org-20061226222529-x4ch5ttzqw6apc84
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Wed 2006-12-27 00:37:35 +0100
    message:
      Fix bug in new follow_branch functions.
    ------------------------------------------------------------
    revno: 236.1.11.1.64
    merged: jelmer at samba.org-20061226222529-x4ch5ttzqw6apc84
    parent: jelmer at samba.org-20061226220429-85up7e6w2qw90pwb
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Tue 2006-12-26 23:25:29 +0100
    message:
      Eliminate unused code.
    ------------------------------------------------------------
    revno: 236.1.11.1.63
    merged: jelmer at samba.org-20061226220429-85up7e6w2qw90pwb
    parent: jelmer at samba.org-20061226210852-oo9vf8m883pb5wka
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Tue 2006-12-26 23:04:29 +0100
    message:
      Optimizations, split out tests.
    ------------------------------------------------------------
    revno: 236.1.11.1.62
    merged: jelmer at samba.org-20061226210852-oo9vf8m883pb5wka
    parent: jelmer at samba.org-20061226195841-9zmend5nbjy6hn5v
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Tue 2006-12-26 22:08:52 +0100
    message:
      Rather than bailing out on dir upgrades, simply cut off history for now.
    ------------------------------------------------------------
    revno: 236.1.11.1.61
    merged: jelmer at samba.org-20061226195841-9zmend5nbjy6hn5v
    parent: jelmer at samba.org-20061226173531-0z6y53h2pwg073m4
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Tue 2006-12-26 20:58:41 +0100
    message:
      Deal with branch downgrades.
    ------------------------------------------------------------
    revno: 236.1.11.1.60
    merged: jelmer at samba.org-20061226173531-0z6y53h2pwg073m4
    parent: jelmer at samba.org-20061226170019-y9g1pa78mbe723kk
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Tue 2006-12-26 18:35:31 +0100
    message:
      Raise exception when a dir upgrade is detected.
    ------------------------------------------------------------
    revno: 236.1.11.1.59
    merged: jelmer at samba.org-20061226170019-y9g1pa78mbe723kk
    parent: jelmer at samba.org-20061226164250-ofgmt9boudgxei2y
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Tue 2006-12-26 18:00:19 +0100
    message:
      Move scheme-specific code out of LogWalker.
    ------------------------------------------------------------
    revno: 236.1.11.1.58
    merged: jelmer at samba.org-20061226164250-ofgmt9boudgxei2y
    parent: jelmer at samba.org-20061226161240-bmoe91d09xx4ha4e
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Tue 2006-12-26 17:42:50 +0100
    message:
      Remove scheme property from logwalker.
    ------------------------------------------------------------
    revno: 236.1.11.1.57
    merged: jelmer at samba.org-20061226161240-bmoe91d09xx4ha4e
    parent: jelmer at samba.org-20061226152813-dv0aagksub846kxu
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Tue 2006-12-26 17:12:40 +0100
    message:
      Move more scheme-specific code out of LogWalker to Repository.
    ------------------------------------------------------------
    revno: 236.1.11.1.56
    merged: jelmer at samba.org-20061226152813-dv0aagksub846kxu
    parent: jelmer at samba.org-20061226044857-llotsyniugb18krc
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Tue 2006-12-26 16:28:13 +0100
    message:
      Add Repository.follow_branch()
    ------------------------------------------------------------
    revno: 236.1.11.1.55
    merged: jelmer at samba.org-20061226044857-llotsyniugb18krc
    parent: jelmer at samba.org-20061226040444-bojmquiro1s5yq0k
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Tue 2006-12-26 05:48:57 +0100
    message:
      Deal with existing files in directories replaced by another instance of themselves. Test will follow.
    ------------------------------------------------------------
    revno: 236.1.11.1.54
    merged: jelmer at samba.org-20061226040444-bojmquiro1s5yq0k
    parent: jelmer at samba.org-20061226023540-mimrjtt0za3exypm
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Tue 2006-12-26 05:04:44 +0100
    message:
      Alternative fix to replace problem.
    ------------------------------------------------------------
    revno: 236.1.11.1.53
    merged: jelmer at samba.org-20061226023540-mimrjtt0za3exypm
    parent: jelmer at samba.org-20061226005109-o98yfqhsc113z0vq
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Tue 2006-12-26 03:35:40 +0100
    message:
      Work around a strange bug in the subversion code that will report an 
      add without a delete when an is being replaced and has the same filename and 
      origin.
    ------------------------------------------------------------
    revno: 236.1.11.1.52
    merged: jelmer at samba.org-20061226005109-o98yfqhsc113z0vq
    parent: jelmer at samba.org-20061226004354-6ky4mphocf8qe6cp
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Tue 2006-12-26 01:51:09 +0100
    message:
      Use Option() magic.
    ------------------------------------------------------------
    revno: 236.1.11.1.51
    merged: jelmer at samba.org-20061226004354-6ky4mphocf8qe6cp
    parent: jelmer at samba.org-20061226002708-dpl9ryphuyi9i63v
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Tue 2006-12-26 01:43:54 +0100
    message:
      Add --scheme option to svn-import command.
    ------------------------------------------------------------
    revno: 236.1.11.1.50
    merged: jelmer at samba.org-20061226002708-dpl9ryphuyi9i63v
    parent: jelmer at samba.org-20061226001231-vfnun5usqacz9wqy
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Tue 2006-12-26 01:27:08 +0100
    message:
      Warn when noticing directories being upgraded to branches, as that'll most likely create trouble.
    ------------------------------------------------------------
    revno: 236.1.11.1.49
    merged: jelmer at samba.org-20061226001231-vfnun5usqacz9wqy
    parent: jelmer at samba.org-20061225233146-vjrnml25vfrv5o3w
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Tue 2006-12-26 01:12:31 +0100
    message:
      Add more tests demonstrating weird behaviour in the subversion libraries.
    ------------------------------------------------------------
    revno: 236.1.11.1.48
    merged: jelmer at samba.org-20061225233146-vjrnml25vfrv5o3w
    parent: jelmer at samba.org-20061225230933-0so0ha9amws46pc4
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Tue 2006-12-26 00:31:46 +0100
    message:
      Use more pools.
    ------------------------------------------------------------
    revno: 236.1.11.1.47
    merged: jelmer at samba.org-20061225230933-0so0ha9amws46pc4
    parent: jelmer at samba.org-20061225230518-a66fwk0gvjolqhfu
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Tue 2006-12-26 00:09:33 +0100
    message:
      Support conversions with branching schemes other than trunk-0
    ------------------------------------------------------------
    revno: 236.1.11.1.46
    merged: jelmer at samba.org-20061225230518-a66fwk0gvjolqhfu
    parent: jelmer at samba.org-20061225171214-tqbig0t3k1za9450
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Tue 2006-12-26 00:05:18 +0100
    message:
      Use pools to try to reduce the memory consumption.
    ------------------------------------------------------------
    revno: 236.1.11.1.45
    merged: jelmer at samba.org-20061225171214-tqbig0t3k1za9450
    parent: jelmer at samba.org-20061225162019-5og4sp9f1k4of0yb
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: bzr.dev
    timestamp: Mon 2006-12-25 18:12:14 +0100
    message:
      Add backwards compatibility when get_dir2() isn't available 
      (Python-subversion < 1.4)
    ------------------------------------------------------------
    revno: 236.1.11.1.44
    merged: jelmer at samba.org-20061225162019-5og4sp9f1k4of0yb
    parent: jelmer at samba.org-20061225044345-kh5byasjooobc1fs
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: bzr.dev
    timestamp: Mon 2006-12-25 17:20:19 +0100
    message:
      Properly recognize discontinued branches. Fixes #76823.
    ------------------------------------------------------------
    revno: 236.1.11.1.43
    merged: jelmer at samba.org-20061225044345-kh5byasjooobc1fs
    parent: jelmer at samba.org-20061225023249-qpfksqt0p29ev0lz
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Mon 2006-12-25 05:43:45 +0100
    message:
      Add test case demonstrating a weird bug in the file id generation code.
    ------------------------------------------------------------
    revno: 236.1.11.1.42
    merged: jelmer at samba.org-20061225023249-qpfksqt0p29ev0lz
    parent: jelmer at samba.org-20061225015153-3dhqe59my32ln6wu
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Mon 2006-12-25 03:32:49 +0100
    message:
      Fix matching formats.
    ------------------------------------------------------------
    revno: 236.1.11.1.41
    merged: jelmer at samba.org-20061225015153-3dhqe59my32ln6wu
    parent: jelmer at samba.org-20061225014959-j4quf4kpduscvf74
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Mon 2006-12-25 02:51:53 +0100
    message:
      svn_ra_dav seems to not be able to set dirent.kind correctly. Appears to fix #56647.
    ------------------------------------------------------------
    revno: 236.1.11.1.40
    merged: jelmer at samba.org-20061225014959-j4quf4kpduscvf74
    parent: jelmer at samba.org-20061225002158-2c0x8r1h6i1qng7e
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Mon 2006-12-25 02:49:59 +0100
    message:
      Update documentation.
    ------------------------------------------------------------
    revno: 236.1.11.1.39
    merged: jelmer at samba.org-20061225002158-2c0x8r1h6i1qng7e
    parent: jelmer at samba.org-20061224231954-aiot9j3k357kcdpl
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Mon 2006-12-25 01:21:58 +0100
    message:
      More efficient implementation of find_children(). 
      Make sure calls to get_dir2() never start with a slash, as that 
      causes strange errors over ra_dav.
    ------------------------------------------------------------
    revno: 236.1.11.1.38
    merged: jelmer at samba.org-20061224231954-aiot9j3k357kcdpl
    parent: jelmer at samba.org-20061224222332-x80vi2r6g4veh2jx
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Mon 2006-12-25 00:19:54 +0100
    message:
      Add test that demonstrates a bug in the http_webdav implementation of 
      svn.ra.get_dir2().
    ------------------------------------------------------------
    revno: 236.1.11.1.37
    merged: jelmer at samba.org-20061224222332-x80vi2r6g4veh2jx
    parent: jelmer at samba.org-20061224002517-f4670do78x74rd0t
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: main
    timestamp: Sun 2006-12-24 23:23:32 +0100
    message:
      Couple of minor performance improvements.

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



More information about the bazaar-commits mailing list