From 71ea4ef0f3e0a821249a60e94b3b1ded7c5377fb Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Sun, 11 Feb 2007 18:21:58 +0000 Subject: [PATCH] 2007-02-11 Don Allingham * src/Merge/_MergePlace.py (MergePlaces.merge): fix typo on add_source_reference svn: r8086 --- ChangeLog | 4 ++++ src/Merge/_MergePlace.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2b2c291a2..0f3d468d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-02-11 Don Allingham + * src/Merge/_MergePlace.py (MergePlaces.merge): fix typo on + add_source_reference + 2007-02-07 Zsolt Foldvari * src/DisplayTabs/_NoteTab.py: move "rich text" notes to 2.3 branch. diff --git a/src/Merge/_MergePlace.py b/src/Merge/_MergePlace.py index cba7f121d..921b48c13 100644 --- a/src/Merge/_MergePlace.py +++ b/src/Merge/_MergePlace.py @@ -133,7 +133,7 @@ class MergePlaces(ManagedWindow.ManagedWindow): # Copy sources from P2 to P1 for source in self.p2.get_source_references(): - self.p1.add_source(source) + self.p1.add_source_reference(source) # Add notes from P2 to P1 if self.note_conflict: