Rev 1573: Merge bzr.dev in /home/robertc/source/baz/integration/
Robert Collins
robertc at robertcollins.net
Thu Mar 9 02:37:19 GMT 2006
------------------------------------------------------------
revno: 1573
revision-id: robertc at robertcollins.net-20060309023701-bac4fa080616d3f7
parent: robertc at robertcollins.net-20060308025107-012d51f27c62e57f
parent: pqm at pqm.ubuntu.com-20060308164921-68f071c6df0938ab
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-03-09 13:37:01 +1100
message:
Merge bzr.dev
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/conflicts.py conflicts.py-20051001061850-78ef952ba63d2b42
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060308164921-68f071c6df0938ab
parent: pqm at pqm.ubuntu.com-20060308143442-fc633cddf3574063
parent: mbp at sourcefrog.net-20060308091106-ecdf014578caafc5
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-03-08 16:49:21 +0000
message:
Use simple xml unescaping to find involved ids, rather than importing xml.sax
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060308091106-ecdf014578caafc5
parent: pqm at pqm.ubuntu.com-20060308003741-08afccbf89005e87
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Wed 2006-03-08 20:11:06 +1100
message:
Use simple xml unescaping rather than importing xml.sax
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060308143442-fc633cddf3574063
parent: pqm at pqm.ubuntu.com-20060308051838-876e9f9ac39ee578
parent: aaron.bentley at utoronto.ca-20060308060843-7284a9b71ec43c21
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-03-08 14:34:42 +0000
message:
Stop using deprecated methods in merge and revert
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060308060843-7284a9b71ec43c21
parent: aaron.bentley at utoronto.ca-20060308052702-d6f40f6caa925eeb
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-03-08 01:08:43 -0500
message:
Stop using deprecated methods in merge and revert
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060308052702-d6f40f6caa925eeb
parent: abentley at panoramicfeedback.com-20060306174748-6a009f0b725d8bdd
parent: aaron.bentley at utoronto.ca-20060308052522-807c265697989dce
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-03-08 00:27:02 -0500
message:
Merge from bzr.ab.integration
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060308052522-807c265697989dce
parent: abentley at panoramicfeedback.com-20060307184118-b18cf90f2bf4e6d8
parent: pqm at pqm.ubuntu.com-20060308030318-87f0fbd9525bb170
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's integration
timestamp: Wed 2006-03-08 00:25:22 -0500
message:
merge from mainline
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060308030318-87f0fbd9525bb170
parent: pqm at pqm.ubuntu.com-20060308003741-08afccbf89005e87
parent: abentley at panoramicfeedback.com-20060306174748-6a009f0b725d8bdd
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-03-08 03:03:18 +0000
message:
A whack of changes.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060306174748-6a009f0b725d8bdd
parent: abentley at panoramicfeedback.com-20060306172600-61ea70d80cc0a159
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's small fixes
timestamp: Mon 2006-03-06 12:47:48 -0500
message:
Got merge_inner's ignore_zero parameter working
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060306172600-61ea70d80cc0a159
parent: abentley at panoramicfeedback.com-20060306161257-b1e3e4aac61d6d3a
parent: abentley at panoramicfeedback.com-20060306170942-4961a715a61df91f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's small fixes
timestamp: Mon 2006-03-06 12:26:00 -0500
message:
Merge from bzr.ab.integration
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060306170942-4961a715a61df91f
parent: abentley at panoramicfeedback.com-20060301224424-69c91b7987524db0
parent: pqm at pqm.ubuntu.com-20060306074417-344f1d83d99b9730
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Mon 2006-03-06 12:09:42 -0500
message:
Merge from bzr.dev
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060306161257-b1e3e4aac61d6d3a
parent: abentley at panoramicfeedback.com-20060303214119-2994d0dbbf83f7a0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's small fixes
timestamp: Mon 2006-03-06 11:12:57 -0500
message:
Formatted unicode config tests as ASCII
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060303214119-2994d0dbbf83f7a0
parent: abentley at panoramicfeedback.com-20060303205512-4c21a6989d12704e
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's small fixes
timestamp: Fri 2006-03-03 16:41:19 -0500
message:
Treated config files as utf-8
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060303205512-4c21a6989d12704e
parent: abentley at panoramicfeedback.com-20060301181631-f3b73117aa68b73f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's small fixes
timestamp: Fri 2006-03-03 15:55:12 -0500
message:
Added See Conflicts to merge help
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060301181631-f3b73117aa68b73f
parent: abentley at panoramicfeedback.com-20060228151452-f9bde3d16eb1b4ec
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's small fixes
timestamp: Wed 2006-03-01 13:16:31 -0500
message:
Updated docs to clarify conflict handling
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060307184118-b18cf90f2bf4e6d8
parent: abentley at panoramicfeedback.com-20060307173814-27971f46eb6324bc
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Tue 2006-03-07 13:41:18 -0500
message:
Fix error handling for merge_modified
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060307173814-27971f46eb6324bc
parent: abentley at panoramicfeedback.com-20060306170942-4961a715a61df91f
parent: pqm at pqm.ubuntu.com-20060307161548-62e73f80c62f6a31
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Tue 2006-03-07 12:38:14 -0500
message:
Merge from bzr.dev
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060308051838-876e9f9ac39ee578
parent: pqm at pqm.ubuntu.com-20060308030318-87f0fbd9525bb170
parent: abentley at panoramicfeedback.com-20060307184118-b18cf90f2bf4e6d8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-03-08 05:18:38 +0000
message:
Fix for merge_modified error handling
More information about the bazaar-commits
mailing list