Robert Collins robertc at robertcollins.net
Wed Nov 23 01:18:50 CST 2005


------------------------------------------------------------
revno: 1426
revision-id: robertc at robertcollins.net-20051123071842-ac5f13e1eb9d905b
parent: robertc at robertcollins.net-20051118072940-c0e304e5d0935d86
parent: mbp at sourcefrog.net-20051122043014-6df209fd93033b59
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Wed 2005-11-23 18:18:42 +1100
message:
  Merge from mpool.
removed:
  bzrlib/mdiff.py                mdiff.py-20050409024839-5452d11fb73b3c362eb84816
  bzrlib/revfile.py              revfile.py-20050409024839-f50e8777febf943eac029aeb
  patches/cache-remote-revisions.diff cacheremoterevisions.diff-20050615041652-ec41056afda8ec11
  patches/cache_weave_inclusions.diff cache_weave_inclusions.diff-20050919104607-e3cc67f726e0cc84
  patches/find-touching-from-seq.diff findtouchingfromseq.diff-20050606123253-430d602a8eb2cd5e
  patches/meta-data-in-inventory.patch metadataininventory.patch-20050613121049-251bafe6906dca57
  patches/ndiff.patch            ndiff.patch-20050704121052-b73266660305dfef
added:
  bzrlib/selftest/testtrace.py   testtrace.py-20051110225523-a21117fc7a07eeff
  bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
modified:
  .rsyncexclude                  rsyncexclude-20050408053852-27e0a5928b6829f645beb2e6
  HACKING                        HACKING-20050805200004-2a5dc975d870f78c
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  TODO                           TODO-20050426050852-44d2ad9048dafbe9
  bzr                            bzr.py-20050313053754-5485f144c7006fa6
  bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/changeset.py            changeset.py-20050513021216-b02ab57fb9738913
  bzrlib/check.py                check.py-20050309040759-f3a679400c06bcc1
  bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
  bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
  bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
  bzrlib/conflicts.py            conflicts.py-20051001061850-78ef952ba63d2b42
  bzrlib/delta.py                delta.py-20050729221636-54cf14ef94783d0a
  bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
  bzrlib/help.py                 help.py-20050505025907-4dd7a6d63912f894
  bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
  bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
  bzrlib/missing.py              missing.py-20050812153334-097f7097e2a8bcd1
  bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
  bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
  bzrlib/selftest/HTTPTestUtil.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
  bzrlib/selftest/__init__.py    selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/selftest/blackbox.py    blackbox.py-20050620052131-a7370d756399f615
  bzrlib/selftest/test_bad_files.py test_bad_files.py-20050918155938-c76a2295c8ab9503
  bzrlib/selftest/test_command.py test_command.py-20051019190109-3b17be0f52eaa7a8
  bzrlib/selftest/test_commit.py test_commit.py-20050914060732-279f057f8c295434
  bzrlib/selftest/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
  bzrlib/selftest/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
  bzrlib/selftest/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
  bzrlib/selftest/testannotate.py testannotate.py-20051013044000-457f44801bfa9d39
  bzrlib/selftest/testbranch.py  testbranch.py-20050711070244-121d632bc37d7253
  bzrlib/selftest/testconfig.py  testconfig.py-20051011041908-742d0c15d8d8c8eb
  bzrlib/selftest/testhashcache.py testhashcache.py-20050706091800-0288ab2659338981
  bzrlib/selftest/testinv.py     testinv.py-20050722220913-1dc326138d1a5892
  bzrlib/selftest/testlog.py     testlog.py-20050728115707-1a514809d7d49309
  bzrlib/selftest/testoptions.py testoptions.py-20051014093702-96457cfc86319a8f
  bzrlib/selftest/testrevprops.py testrevprops.py-20051013073044-92bc3c68302ce1bf
  bzrlib/selftest/testtestament.py testtestament.py-20051011100429-5df1657310caa929
  bzrlib/selftest/testtransport.py testtransport.py-20050718175618-e5cdb99f4555ddce
  bzrlib/selftest/versioning.py  versioning.py-20050622071821-3ddf5e2e5e93c602
  bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
  bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
  bzrlib/transport/http.py       http_transport.py-20050711212304-506c5fd1059ace96
  bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
  bzrlib/upgrade.py              history2weaves.py-20050818063535-e7d319791c19a8b2
  bzrlib/weave.py                knit.py-20050627021749-759c29984154256b
  doc/random.txt                 random.txt-20050309044946-269c29512b381f5b
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051122043014-6df209fd93033b59
    parent: mbp at sourcefrog.net-20051122041344-d98af0e4bc18f3da
    committer: Martin Pool <mbp at sourcefrog.net>
    timestamp: Tue 2005-11-22 15:30:14 +1100
    message:
      Exclude more files from dumb-rsync upload
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051122041344-d98af0e4bc18f3da
    parent: mbp at sourcefrog.net-20051122033237-5099d6acc4751400
    parent: shamrin at gmail.com-20051121092252-4f536da7bb6fee90
    committer: Martin Pool <mbp at sourcefrog.net>
    timestamp: Tue 2005-11-22 15:13:44 +1100
    message:
      [merge] win32 fixes (alexey)
    ------------------------------------------------------------
    merged: shamrin at gmail.com-20051121092252-4f536da7bb6fee90
    parent: shamrin at gmail.com-20051121090718-48400620bf12c6c6
    committer: Alexey Shamrin <shamrin at gmail.com>
    timestamp: Mon 2005-11-21 04:22:52 -0500
    message:
      updated NEWS to include forgotten changes
    ------------------------------------------------------------
    merged: shamrin at gmail.com-20051121090718-48400620bf12c6c6
    parent: mbp at sourcefrog.net-20051118081007-80523bf145eb319b
    parent: john at arbash-meinel.com-20051028202916-b350435b905ab6c1
    committer: Alexey Shamrin <shamrin at gmail.com>
    timestamp: Mon 2005-11-21 04:07:18 -0500
    message:
      merge forgotten win32 fixes from http://bzr.arbash-meinel.com/branches/bzr/win32/
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20051028202916-b350435b905ab6c1
    parent: john at arbash-meinel.com-20051028202807-09e118d024cc7856
    committer: John Arbash Meinel <john at arbash-meinel.com>
    timestamp: Fri 2005-10-28 14:29:16 -0600
    message:
      [patch] Alexander Belchenko patch #12: use os.pathsep for BZR_PLUGIN_PATH
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20051028202807-09e118d024cc7856
    parent: john at arbash-meinel.com-20051028201738-ed1b168cd4aac775
    committer: John Arbash Meinel <john at arbash-meinel.com>
    timestamp: Fri 2005-10-28 14:28:07 -0600
    message:
      [patch] Alexander Belchenko patch #9, skip stat tests for win32
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20051028201738-ed1b168cd4aac775
    parent: john at arbash-meinel.com-20051028201605-3479df5255f74bf1
    committer: John Arbash Meinel <john at arbash-meinel.com>
    timestamp: Fri 2005-10-28 14:17:38 -0600
    message:
      [patch] testhashcache delay for win32 and cygwin
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20051028201605-3479df5255f74bf1
    parent: john at arbash-meinel.com-20051028193852-a9f11a3ecb984a83
    committer: John Arbash Meinel <john at arbash-meinel.com>
    timestamp: Fri 2005-10-28 14:16:05 -0600
    message:
      Updated build_tree to use fixed line-endings for tests which read the file contents and compare
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20051028193852-a9f11a3ecb984a83
    parent: john at arbash-meinel.com-20051028193246-94db6bf24d9b95b2
    committer: John Arbash Meinel <john at arbash-meinel.com>
    timestamp: Fri 2005-10-28 13:38:52 -0600
    message:
      Applying fix for EWOULDBLOCK under win32
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20051028193246-94db6bf24d9b95b2
    parent: john at arbash-meinel.com-20051028193206-a197c629d0c5657a
    committer: John Arbash Meinel <john at arbash-meinel.com>
    timestamp: Fri 2005-10-28 13:32:46 -0600
    message:
      Updating testconfig to handle missing environment variables
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20051028193206-a197c629d0c5657a
    parent: john at arbash-meinel.com-20051028192629-e441c87ce4bc3b19
    committer: John Arbash Meinel <john at arbash-meinel.com>
    timestamp: Fri 2005-10-28 13:32:06 -0600
    message:
      Making old_env a private member
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20051028192629-e441c87ce4bc3b19
    parent: john at arbash-meinel.com-20051028191653-60f76d76b2cac7c2
    committer: John Arbash Meinel <john at arbash-meinel.com>
    timestamp: Fri 2005-10-28 13:26:29 -0600
    message:
      Refactored environment cleaning code
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20051028191653-60f76d76b2cac7c2
    parent: john at arbash-meinel.com-20051028191501-8f599abdc5062bd2
    committer: John Arbash Meinel <john at arbash-meinel.com>
    timestamp: Fri 2005-10-28 13:16:53 -0600
    message:
      [patch] Aaron Bentley's HOME fix.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20051028191501-8f599abdc5062bd2
    parent: mbp at sourcefrog.net-20051028055302-14e925407b2b09d4
    committer: John Arbash Meinel <john at arbash-meinel.com>
    timestamp: Fri 2005-10-28 13:15:01 -0600
    message:
      Adding my win32 patch for moving the home directory.
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051118081007-80523bf145eb319b
    parent: mbp at sourcefrog.net-20051118080151-8c35865828c63a4b
    parent: hmeland at twoflower.uio.no-20051006225544-bc7ef2300f20d9a3
    committer: Martin Pool <mbp at sourcefrog.net>
    timestamp: Fri 2005-11-18 19:10:07 +1100
    message:
      [merge] fix \t in commit messages
    ------------------------------------------------------------
    merged: hmeland at twoflower.uio.no-20051006225544-bc7ef2300f20d9a3
    parent: hmeland at twoflower.uio.no-20051006120356-10cd03703265f8c3
    committer: Harald Meland <hmeland at twoflower.uio.no>
    timestamp: Fri 2005-10-07 00:55:44 +0200
    message:
      Cleanup + better test of commit-msg control character escape code.
    ------------------------------------------------------------
    merged: hmeland at twoflower.uio.no-20051006120356-10cd03703265f8c3
    parent: mbp at sourcefrog.net-20051006105312-06320dbb986e4bb3
    committer: Harald Meland <hmeland at twoflower.uio.no>
    timestamp: Thu 2005-10-06 14:03:56 +0200
    message:
      Fixed typo that could cause TABs in commit messages to be escaped.
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051118080151-8c35865828c63a4b
    parent: mbp at sourcefrog.net-20051118065820-baa729335645fc75
    committer: Martin Pool <mbp at sourcefrog.net>
    timestamp: Fri 2005-11-18 19:01:51 +1100
    message:
      Make annotate cope better with revisions committed without a valid 
      email address.  (Marien Zwart)
      
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051118065820-baa729335645fc75
    parent: mbp at sourcefrog.net-20051117080757-c491f5a14f179f3b
    parent: jamie at anchor.net.au-20051118063902-a487ab27c9b0b700
    committer: Martin Pool <mbp at sourcefrog.net>
    timestamp: Fri 2005-11-18 17:58:20 +1100
    message:
      [merge] jaq
    ------------------------------------------------------------
    merged: jamie at anchor.net.au-20051118063902-a487ab27c9b0b700
    parent: jamie at anchor.net.au-20051118054504-e2c6795412301c92
    committer: Jamie Wilkinson <jamie at anchor.net.au>
    timestamp: Fri 2005-11-18 17:39:02 +1100
    message:
      add some examples to the documentation for Command.takes_args
    ------------------------------------------------------------
    merged: jamie at anchor.net.au-20051118054504-e2c6795412301c92
    parent: jamie at anchor.net.au-20051118023024-feaa5729c868a450
    parent: mbp at sourcefrog.net-20051117074538-5e113b7ad19a3b5d
    committer: Jamie Wilkinson <jamie at anchor.net.au>
    timestamp: Fri 2005-11-18 16:45:04 +1100
    message:
      partial merge from Martin, fixed conflicts with bzrlib/tree.py and revno 1391
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051117074538-5e113b7ad19a3b5d
    parent: mbp at sourcefrog.net-20051117034930-68148f4f6ee985e8
    parent: robertc at robertcollins.net-20051113201422-8a34ef413bfc8222
    committer: Martin Pool <mbp at sourcefrog.net>
    timestamp: Thu 2005-11-17 18:45:38 +1100
    message:
      [merge] much integrated work from robert and john
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051117034930-68148f4f6ee985e8
    parent: mbp at sourcefrog.net-20051117032731-d76f4b67834e0f8c
    committer: Martin Pool <mbp at sourcefrog.net>
    timestamp: Thu 2005-11-17 14:49:30 +1100
    message:
      Give a warning, not exception, when trying to merge
      x-bit against deletion.
      
      Workaround for #4558
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051117032731-d76f4b67834e0f8c
    parent: mbp at sourcefrog.net-20051117010225-1be5054d78de0774
    committer: Martin Pool <mbp at sourcefrog.net>
    timestamp: Thu 2005-11-17 14:27:31 +1100
    message:
      doc
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051117010225-1be5054d78de0774
    parent: mbp at sourcefrog.net-20051116074703-03f47cbe4a4f1e43
    committer: Martin Pool <mbp at sourcefrog.net>
    timestamp: Thu 2005-11-17 12:02:25 +1100
    message:
      Add alias 'resolved'
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051116074703-03f47cbe4a4f1e43
    parent: mbp at sourcefrog.net-20051116073657-5ce3bc2f64ef1e23
    committer: Martin Pool <mbp at sourcefrog.net>
    timestamp: Wed 2005-11-16 18:47:03 +1100
    message:
      Add test for merging metadata change vs file deletion
      (currently passes but should fail)
      
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051116073657-5ce3bc2f64ef1e23
    parent: mbp at sourcefrog.net-20051116072650-0d408c1006d92ea5
    committer: Martin Pool <mbp at sourcefrog.net>
    timestamp: Wed 2005-11-16 18:36:57 +1100
    message:
      Remove obsolete import of revfile
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051116072650-0d408c1006d92ea5
    parent: mbp at sourcefrog.net-20051116071416-89d66c80f8202539
    committer: Martin Pool <mbp at sourcefrog.net>
    timestamp: Wed 2005-11-16 18:26:50 +1100
    message:
      Document BZR_PDB
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051116071416-89d66c80f8202539
    parent: mbp at sourcefrog.net-20051116070625-897f4b981477d328
    committer: Martin Pool <mbp at sourcefrog.net>
    timestamp: Wed 2005-11-16 18:14:16 +1100
    message:
      Really enter the debugger on failure
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051116070625-897f4b981477d328
    parent: mbp at sourcefrog.net-20051116040729-114e9e3777d53f36
    committer: Martin Pool <mbp at sourcefrog.net>
    timestamp: Wed 2005-11-16 18:06:25 +1100
    message:
      Run postmortem debugger if BZR_PDB is set
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051116040729-114e9e3777d53f36
    parent: mbp at sourcefrog.net-20051116032119-119984187b55614a
    committer: Martin Pool <mbp at sourcefrog.net>
    timestamp: Wed 2005-11-16 15:07:29 +1100
    message:
      [patch] handle bad IOError subclass raised by urlopen
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051116032119-119984187b55614a
    parent: mbp at sourcefrog.net-20051115211836-f5bcd5655a854f0e
    parent: abentley at panoramicfeedback.com-20051115210909-65710970107c20a3
    committer: Martin Pool <mbp at sourcefrog.net>
    timestamp: Wed 2005-11-16 14:21:19 +1100
    message:
      [merge] aaron, various fixes
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051115210909-65710970107c20a3
    parent: aaron.bentley at utoronto.ca-20051112153337-ab72703188dbde9a
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    timestamp: Tue 2005-11-15 16:09:09 -0500
    message:
      Throw ConnectionError instead of NoSuchFile except when we get a 404
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051112153337-ab72703188dbde9a
    parent: aaron.bentley at utoronto.ca-20051111174611-05c622f83aca3d78
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Sat 2005-11-12 10:33:37 -0500
    message:
      Fixed missing --verbose
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051111174611-05c622f83aca3d78
    parent: aaron.bentley at utoronto.ca-20051111172622-bff7851191b357b9
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Fri 2005-11-11 12:46:11 -0500
    message:
      Support whitespace in diff filenames
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051111172622-bff7851191b357b9
    parent: aaron.bentley at utoronto.ca-20051110161534-cc77434068bc3789
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Fri 2005-11-11 12:26:22 -0500
    message:
      Support diff with two branches as input.
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051110161534-cc77434068bc3789
    parent: aaron.bentley at utoronto.ca-20051109174311-247622bef3c8b28b
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Thu 2005-11-10 11:15:34 -0500
    message:
      Got unicode nicks working properly, even when gannotate is installed.
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051109174311-247622bef3c8b28b
    parent: aaron.bentley at utoronto.ca-20051109160251-798e03cb54337415
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Wed 2005-11-09 12:43:11 -0500
    message:
      Fixed diff and status on newly-added, newly-deleted files
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051109160251-798e03cb54337415
    parent: aaron.bentley at utoronto.ca-20051109155022-1b2e34d53af30253
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Wed 2005-11-09 11:02:51 -0500
    message:
      Updated NEWS
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051109155022-1b2e34d53af30253
    parent: aaron.bentley at utoronto.ca-20051109150758-28ae2276023b9ebb
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Wed 2005-11-09 10:50:22 -0500
    message:
      Fixed handling of short options not accepted by the command
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051109150758-28ae2276023b9ebb
    parent: aaron.bentley at utoronto.ca-20051108171256-655710b03a52fb91
    parent: mbp at sourcefrog.net-20051107162112-4f7170c06c6cde98
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Wed 2005-11-09 10:07:58 -0500
    message:
      Merged Martin's latest
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051108171256-655710b03a52fb91
    parent: aaron.bentley at utoronto.ca-20051107214055-992c47dfe068ab3e
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Tue 2005-11-08 12:12:56 -0500
    message:
      Handled more pipe errors for display commands.
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051107214055-992c47dfe068ab3e
    parent: aaron.bentley at utoronto.ca-20051107153116-783a2e083b3cd1dd
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Mon 2005-11-07 16:40:55 -0500
    message:
      Changed error status to 3
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051107153116-783a2e083b3cd1dd
    parent: aaron.bentley at utoronto.ca-20051107072654-ec8a0d82496d09b2
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Mon 2005-11-07 10:31:16 -0500
    message:
      Only keep test failure directories if --keep-output is specified
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051107072654-ec8a0d82496d09b2
    parent: aaron.bentley at utoronto.ca-20051106210147-55494cae0fef8161
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Mon 2005-11-07 02:26:54 -0500
    message:
      Tweaked short-log as Meinel suggested
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051106210147-55494cae0fef8161
    parent: aaron.bentley at utoronto.ca-20051106203107-656664b5d52fcc1a
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Sun 2005-11-06 16:01:47 -0500
    message:
      Refactored long-format log printing
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051106203107-656664b5d52fcc1a
    parent: aaron.bentley at utoronto.ca-20051106063454-80e2a7db6887426c
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Sun 2005-11-06 15:31:07 -0500
    message:
      Added branch nicks to long-format logs
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051106063454-80e2a7db6887426c
    parent: aaron.bentley at utoronto.ca-20051105225606-fba8ce12fd8f35d0
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Sun 2005-11-06 01:34:54 -0500
    message:
      Fixed tests
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051105225606-fba8ce12fd8f35d0
    parent: aaron.bentley at utoronto.ca-20051105054948-94eeb17b8949b265
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Sat 2005-11-05 17:56:06 -0500
    message:
      Added branch nicks to revisions
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051105054948-94eeb17b8949b265
    parent: aaron.bentley at utoronto.ca-20051104232254-a0bf87b338b2d29d
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Sat 2005-11-05 00:49:48 -0500
    message:
      Implemented nick command
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051104232254-a0bf87b338b2d29d
    parent: aaron.bentley at utoronto.ca-20051102150604-cef0eda2504b0830
    parent: mbp at sourcefrog.net-20051031205250-b0c7f1d9ece522f5
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Fri 2005-11-04 18:22:54 -0500
    message:
      Merged Martin
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051102150604-cef0eda2504b0830
    parent: aaron.bentley at utoronto.ca-20051102071053-d3837c9849d7aaa2
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Wed 2005-11-02 10:06:04 -0500
    message:
      Got writes of existing tree configs working.
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051102071053-d3837c9849d7aaa2
    parent: abentley at panoramicfeedback.com-20051031214324-46595f15fe93be37
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Wed 2005-11-02 02:10:53 -0500
    message:
      Added support for branch nicks
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051031214324-46595f15fe93be37
    parent: abentley at panoramicfeedback.com-20051031162255-daf9d40a1045ce7a
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    timestamp: Mon 2005-10-31 16:43:24 -0500
    message:
      Error when run with -OO
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051031162255-daf9d40a1045ce7a
    parent: aaron.bentley at utoronto.ca-20051029043647-3eb210c9544af457
    parent: mbp at sourcefrog.net-20051031120610-da41deafd12fdbb8
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    timestamp: Mon 2005-10-31 11:22:55 -0500
    message:
      Merge from mainline
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051029043647-3eb210c9544af457
    parent: abentley at panoramicfeedback.com-20051028194818-1c851625a7c8f6ae
    parent: aaron.bentley at utoronto.ca-20051028035424-6b86500f7601bb64
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Sat 2005-10-29 00:36:47 -0400
    message:
      Merged me
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051028035424-6b86500f7601bb64
    parent: aaron.bentley at utoronto.ca-20051028023422-f4c0b704edd5f79d
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Thu 2005-10-27 23:54:24 -0400
    message:
      Switched to specific error; not all URLErrors have a .code member
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051028194818-1c851625a7c8f6ae
    parent: abentley at panoramicfeedback.com-20051028194043-6eb3ea6a2127b3ff
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    timestamp: Fri 2005-10-28 15:48:18 -0400
    message:
      Fixed weave conflict handling
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051028194043-6eb3ea6a2127b3ff
    parent: abentley at panoramicfeedback.com-20051028183841-134d2004d4f716e9
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    timestamp: Fri 2005-10-28 15:40:43 -0400
    message:
      Removed todo, restored test
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051028183841-134d2004d4f716e9
    parent: abentley at panoramicfeedback.com-20051028175907-ae6a1d10ee73fd54
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    timestamp: Fri 2005-10-28 14:38:41 -0400
    message:
      Made weave merge succeed if interesting files match history
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051028175907-ae6a1d10ee73fd54
    parent: abentley at panoramicfeedback.com-20051028170313-17197f70bb87c1bc
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    timestamp: Fri 2005-10-28 13:59:07 -0400
    message:
      Implemented remerge
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051028170313-17197f70bb87c1bc
    parent: abentley at panoramicfeedback.com-20051028154016-d6db283d08fc2b73
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    timestamp: Fri 2005-10-28 13:03:13 -0400
    message:
      Handle errors logging errors
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051028154016-d6db283d08fc2b73
    parent: abentley at panoramicfeedback.com-20051028153925-2273973029880103
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    timestamp: Fri 2005-10-28 11:40:16 -0400
    message:
      Added early-exit message in merge
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051028153925-2273973029880103
    parent: mbp at sourcefrog.net-20051028055302-14e925407b2b09d4
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    timestamp: Fri 2005-10-28 11:39:25 -0400
    message:
      Implemented conflicts.restore
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051115211836-f5bcd5655a854f0e
    parent: mbp at sourcefrog.net-20051115014345-19d5f29117a85db9
    committer: Martin Pool <mbp at sourcefrog.net>
    timestamp: Wed 2005-11-16 08:18:36 +1100
    message:
      remove obsolete module
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051115014345-19d5f29117a85db9
    parent: mbp at sourcefrog.net-20051115013834-f3ac006b080f099c
    committer: Martin Pool <mbp at sourcefrog.net>
    timestamp: Tue 2005-11-15 12:43:45 +1100
    message:
      [path] bgu in help_on_command (Robert Widhopf-Frank)
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051115013834-f3ac006b080f099c
    parent: mbp at sourcefrog.net-20051110232200-e59722d2c343821f
    committer: Martin Pool <mbp at sourcefrog.net>
    timestamp: Tue 2005-11-15 12:38:34 +1100
    message:
      doc
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051110232200-e59722d2c343821f
    parent: mbp at sourcefrog.net-20051110230750-6c7eda1ecc454e22
    committer: Martin Pool <mbp at sourcefrog.net>
    timestamp: Thu 2005-11-10 18:22:00 -0500
    message:
      Hide more stuff in bzrlib.trace
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051110230750-6c7eda1ecc454e22
    parent: mbp at sourcefrog.net-20051110230246-359fb27e659a0ae8
    committer: Martin Pool <mbp at sourcefrog.net>
    timestamp: Thu 2005-11-10 18:07:50 -0500
    message:
      Remove some direct calls to logging, and some dead code
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051110230246-359fb27e659a0ae8
    parent: mbp at sourcefrog.net-20051110230148-897aa161a6be2b56
    committer: Martin Pool <mbp at sourcefrog.net>
    timestamp: Thu 2005-11-10 18:02:46 -0500
    message:
      Code format cleanups
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051110230148-897aa161a6be2b56
    parent: mbp at sourcefrog.net-20051110225532-5b461dd44225acea
    committer: Martin Pool <mbp at sourcefrog.net>
    timestamp: Thu 2005-11-10 18:01:48 -0500
    message:
      Remove dead code
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051110225532-5b461dd44225acea
    parent: mbp at sourcefrog.net-20051110224711-f081f4c75d572d45
    committer: Martin Pool <mbp at sourcefrog.net>
    timestamp: Thu 2005-11-10 17:55:32 -0500
    message:
      Add new selftest module.
      
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051110224711-f081f4c75d572d45
    parent: mbp at sourcefrog.net-20051110224001-6d43e9ddff8df7a5
    committer: Martin Pool <mbp at sourcefrog.net>
    timestamp: Thu 2005-11-10 17:47:11 -0500
    message:
      Cleanup exception formatting stuff
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051110224001-6d43e9ddff8df7a5
    parent: mbp at sourcefrog.net-20051110222235-a4236d905bf8f851
    committer: Martin Pool <mbp at sourcefrog.net>
    timestamp: Thu 2005-11-10 17:40:01 -0500
    message:
      Better formatting of builtin errors
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051110222235-a4236d905bf8f851
    parent: mbp at sourcefrog.net-20051110214657-568aa1b0d69b32e4
    committer: Martin Pool <mbp at sourcefrog.net>
    timestamp: Thu 2005-11-10 17:22:35 -0500
    message:
      Code and tests for shorter formatting of error messages
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051110214657-568aa1b0d69b32e4
    parent: mbp at sourcefrog.net-20051110213944-f30c55bbea1d311c
    committer: Martin Pool <mbp at sourcefrog.net>
    timestamp: Thu 2005-11-10 16:46:57 -0500
    message:
      Remove some obsolete patches/modules
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051110213944-f30c55bbea1d311c
    parent: mbp at sourcefrog.net-20051108201602-cf6302c61e4cd412
    committer: Martin Pool <mbp at sourcefrog.net>
    timestamp: Thu 2005-11-10 16:39:44 -0500
    message:
      Disable selftest that was creating .bazaar in source directory
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051108201602-cf6302c61e4cd412
    parent: mbp at sourcefrog.net-20051108164424-8b210743db6f470a
    parent: jelmer at samba.org-20051108005305-b26c6faafa3d8955
    committer: Martin Pool <mbp at sourcefrog.net>
    timestamp: Tue 2005-11-08 15:16:02 -0500
    message:
      [merge] jelmer
    ------------------------------------------------------------
    merged: jelmer at samba.org-20051108005305-b26c6faafa3d8955
    parent: jelmer at samba.org-20051108002604-50da4251e6f978e7
    committer: Jelmer Vernooij <jelmer at samba.org>
    timestamp: Tue 2005-11-08 01:53:05 +0100
    message:
      Support -r option to bzr status. The backend code already handled 
      status differences between revisions, it just wasn't exposed to the user yet.
      Add more extended blackbox test for 'bzr status'
      
    ------------------------------------------------------------
    merged: jelmer at samba.org-20051108002604-50da4251e6f978e7
    parent: jelmer at samba.org-20051108000540-a3c63ec1288725da
    committer: Jelmer Vernooij <jelmer at samba.org>
    timestamp: Tue 2005-11-08 01:26:04 +0100
    message:
      Remove already implemented and duplicate items from TODO
      
    ------------------------------------------------------------
    merged: jelmer at samba.org-20051108000540-a3c63ec1288725da
    parent: jelmer at samba.org-20051107222056-ae58aae2cfa2ed58
    committer: Jelmer Vernooij <jelmer at samba.org>
    timestamp: Tue 2005-11-08 01:05:40 +0100
    message:
      Don't quite when tracefile can't be opened. Display warning
      correctly.
      
    ------------------------------------------------------------
    merged: jelmer at samba.org-20051107222056-ae58aae2cfa2ed58
    parent: mbp at sourcefrog.net-20051107162112-4f7170c06c6cde98
    committer: Jelmer Vernooij <jelmer at samba.org>
    timestamp: Mon 2005-11-07 23:20:56 +0100
    message:
      Fix a couple of typo's
      
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051108164424-8b210743db6f470a
    parent: mbp at sourcefrog.net-20051108164042-772073c40e6c78f2
    committer: Martin Pool <mbp at sourcefrog.net>
    timestamp: Tue 2005-11-08 11:44:24 -0500
    message:
      How to maintain the NEWS file
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051108164042-772073c40e6c78f2
    parent: mbp at sourcefrog.net-20051107162112-4f7170c06c6cde98
    parent: jelmer at samba.org-20051104211455-2aa8047a33d6d957
    committer: Martin Pool <mbp at sourcefrog.net>
    timestamp: Tue 2005-11-08 11:40:42 -0500
    message:
      [merge] Abstract branch renaming from jelmer
    ------------------------------------------------------------
    merged: jelmer at samba.org-20051104211455-2aa8047a33d6d957
    parent: jelmer at samba.org-20051104172605-9288f261492667fd
    committer: Jelmer Vernooij <jelmer at samba.org>
    timestamp: Fri 2005-11-04 22:14:55 +0100
    message:
      Rename NativeBranch -> BzrBranch
      
    ------------------------------------------------------------
    merged: jelmer at samba.org-20051104172605-9288f261492667fd
    parent: jelmer at samba.org-20051030183932-9188295b602ce28c
    parent: mbp at sourcefrog.net-20051031205250-b0c7f1d9ece522f5
    committer: Jelmer Vernooij <jelmer at samba.org>
    timestamp: Fri 2005-11-04 18:26:05 +0100
    message:
      Merge from Martin
      
    ------------------------------------------------------------
    merged: jelmer at samba.org-20051030183932-9188295b602ce28c
    parent: jelmer at samba.org-20051030172251-b6c14e0ca0daf326
    committer: Jelmer Vernooij <jelmer at samba.org>
    timestamp: Sun 2005-10-30 19:39:32 +0100
    message:
      Move some more generic methods from NativeBranch to Branch.
      
    ------------------------------------------------------------
    merged: jelmer at samba.org-20051030172251-b6c14e0ca0daf326
    parent: jelmer at samba.org-20051030172031-22843b518b4eae57
    committer: Jelmer Vernooij <jelmer at samba.org>
    timestamp: Sun 2005-10-30 18:22:51 +0100
    message:
      Move some generic methods of NativeBranch to Branch.
      Add abstract methods to Branch that simply raise NotImplementedError
      
    ------------------------------------------------------------
    merged: jelmer at samba.org-20051030172031-22843b518b4eae57
    parent: robertc at robertcollins.net-20051030145626-2f57bd49824dd1d7
    committer: Jelmer Vernooij <jelmer at samba.org>
    timestamp: Sun 2005-10-30 18:20:31 +0100
    message:
      Rename _Branch to NativeBranch to better indicate the difference with
      foreign branches.
      
    ------------------------------------------------------------
    merged: jamie at anchor.net.au-20051118023024-feaa5729c868a450
    parent: jamie at anchor.net.au-20051114071148-ae0454c7e5297dcd
    committer: Jamie Wilkinson <jamie at anchor.net.au>
    timestamp: Fri 2005-11-18 13:30:24 +1100
    message:
      Fix a typo and grammar in Config.username() docstring.
      
    ------------------------------------------------------------
    merged: jamie at anchor.net.au-20051114071148-ae0454c7e5297dcd
    parent: mbp at sourcefrog.net-20051107162112-4f7170c06c6cde98
    committer: Jamie Wilkinson <jamie at anchor.net.au>
    timestamp: Mon 2005-11-14 18:11:48 +1100
    message:
      Exclude '.bzrignore' from exports.
      
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051117080757-c491f5a14f179f3b
    parent: mbp at sourcefrog.net-20051117080032-d6356c1aa14338a9
    parent: dsilvers at digital-scurf.org-20051116162412-3830d783879122c7
    committer: Martin Pool <mbp at sourcefrog.net>
    timestamp: Thu 2005-11-17 19:07:57 +1100
    message:
      [merge] ftp transport, renamed-modified
    ------------------------------------------------------------
    merged: dsilvers at digital-scurf.org-20051116162412-3830d783879122c7
    parent: dsilvers at digital-scurf.org-20051116134641-3bd82ecd1b4af5cd
    committer: Daniel Silverstone <dsilvers at digital-scurf.org>
    timestamp: Wed 2005-11-16 16:24:12 +0000
    message:
      Add FTP transport
    ------------------------------------------------------------
    merged: dsilvers at digital-scurf.org-20051116134641-3bd82ecd1b4af5cd
    parent: dsilvers at digital-scurf.org-20051116013639-9cf6ba2d9fe0125d
    parent: mbp at sourcefrog.net-20051116032119-119984187b55614a
    committer: Daniel Silverstone <dsilvers at digital-scurf.org>
    timestamp: Wed 2005-11-16 13:46:41 +0000
    message:
      Merge from mainline
    ------------------------------------------------------------
    merged: dsilvers at digital-scurf.org-20051116013639-9cf6ba2d9fe0125d
    parent: dsilvers at digital-scurf.org-20051110223301-1133172e54a0580d
    committer: Daniel Silverstone <dsilvers at digital-scurf.org>
    timestamp: Wed 2005-11-16 01:36:39 +0000
    message:
      Allow the delta display routine to show when a file
      has been both renamed and modified in any way (text or meta)
      
      This is done without altering the internal structure of the
      TreeDelta object in case it is needed elsewhere as-is
      
    ------------------------------------------------------------
    merged: dsilvers at digital-scurf.org-20051110223301-1133172e54a0580d
    parent: mbp at sourcefrog.net-20051107162112-4f7170c06c6cde98
    committer: Daniel Silverstone <dsilvers at digital-scurf.org>
    timestamp: Thu 2005-11-10 17:33:01 -0500
    message:
      A revision of zero is meant to be zero, not None. Also order the revisions supplied to cope with the user being confused
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051117080032-d6356c1aa14338a9
    parent: mbp at sourcefrog.net-20051117074538-5e113b7ad19a3b5d
    parent: aaron.bentley at utoronto.ca-20051116050009-f9639470edb47a84
    committer: Martin Pool <mbp at sourcefrog.net>
    timestamp: Thu 2005-11-17 19:00:32 +1100
    message:
      [merge] aaron
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051116050009-f9639470edb47a84
    parent: aaron.bentley at utoronto.ca-20051116042826-22da9f6f4aca479c
    parent: mbp at sourcefrog.net-20051116032119-119984187b55614a
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Wed 2005-11-16 00:00:09 -0500
    message:
      Merged the mainline
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051116042826-22da9f6f4aca479c
    parent: abentley at panoramicfeedback.com-20051115210909-65710970107c20a3
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Tue 2005-11-15 23:28:26 -0500
    message:
      Fixed handling of files in mixed branches
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051122033237-5099d6acc4751400
    parent: mbp at sourcefrog.net-20051121085156-4fc6a9921c2cc723
    parent: aaron.bentley at utoronto.ca-20051119225637-e7afc16a06a31b59
    committer: Martin Pool <mbp at sourcefrog.net>
    timestamp: Tue 2005-11-22 14:32:37 +1100
    message:
      [merge] make sure to get all text revisions during merge (aaron)
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051119225637-e7afc16a06a31b59
    parent: aaron.bentley at utoronto.ca-20051119200756-339f5a64abed668d
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Sat 2005-11-19 17:56:37 -0500
    message:
      Fixed fetch to be safer wrt ghosts and corrupt branches
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051119200756-339f5a64abed668d
    parent: abentley at panoramicfeedback.com-20051118144716-c27df491076e98f3
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Sat 2005-11-19 15:07:56 -0500
    message:
      Added repr for Weave
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051118144716-c27df491076e98f3
    parent: abentley at panoramicfeedback.com-20051117204623-4265b87790561ee4
    parent: mbp at sourcefrog.net-20051118081007-80523bf145eb319b
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    timestamp: Fri 2005-11-18 09:47:16 -0500
    message:
      Merge from Martin
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051117204623-4265b87790561ee4
    parent: abentley at panoramicfeedback.com-20051117204200-efd6b944e3f7a6be
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    timestamp: Thu 2005-11-17 15:46:23 -0500
    message:
      Removed unused var
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051117204200-efd6b944e3f7a6be
    parent: abentley at panoramicfeedback.com-20051117155155-bdf57cc1c7efb11d
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    timestamp: Thu 2005-11-17 15:42:00 -0500
    message:
      Removed debugging code
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051117155155-bdf57cc1c7efb11d
    parent: abentley at panoramicfeedback.com-20051117154631-2d0eb45521b98363
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    timestamp: Thu 2005-11-17 10:51:55 -0500
    message:
      Removed debug prints
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051117154631-2d0eb45521b98363
    parent: abentley at panoramicfeedback.com-20051117154041-912d8f3bdd7d5a62
    parent: mbp at sourcefrog.net-20051117074538-5e113b7ad19a3b5d
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    timestamp: Thu 2005-11-17 10:46:31 -0500
    message:
      Merge from mainline
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051117154041-912d8f3bdd7d5a62
    parent: abentley at panoramicfeedback.com-20051117150928-f40f1a19c81473fb
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    timestamp: Thu 2005-11-17 10:40:41 -0500
    message:
      Detect AWOL inventory revisions all at once
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051117150928-f40f1a19c81473fb
    parent: aaron.bentley at utoronto.ca-20051116050009-f9639470edb47a84
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    timestamp: Thu 2005-11-17 10:09:28 -0500
    message:
      Made bzr check for stored revisions missing from ancestry
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051121085156-4fc6a9921c2cc723
    parent: mbp at sourcefrog.net-20051118081007-80523bf145eb319b
    committer: Martin Pool <mbp at sourcefrog.net>
    timestamp: Mon 2005-11-21 19:51:56 +1100
    message:
      [patch] add 'bzr inventory --kind directory'; remove 'bzr directories'
      (Johan Rydberg)
      



More information about the bazaar-commits mailing list