Rev 1572: A whack of changes. in
/home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Wed Mar 8 03:03:21 GMT 2006
------------------------------------------------------------
revno: 1572
revision-id: 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.
modified:
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/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
------------------------------------------------------------
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
More information about the bazaar-commits
mailing list