Ubuntu
meld package

Merge lp:~ubuntu-branches/ubuntu/oneiric/meld/oneiric-201109300511 into lp:ubuntu/oneiric/meld

  1. Oneiric (11.10)
  2. oneiric-201109300511
  3. Merge into oneiric
Proposed by Ubuntu Package Importer
Status: Needs review
Proposed branch: lp:~ubuntu-branches/ubuntu/oneiric/meld/oneiric-201109300511
Merge into: lp:ubuntu/oneiric/meld
Diff against target: 73 lines (+60/-0) (has conflicts)
2 files modified
debian/patches/fix-modified-indicator.patch (+32/-0)
debian/patches/fix-save-after-undo.patch (+28/-0)
Conflict adding file debian/patches/fix-modified-indicator.patch.  Moved existing file to debian/patches/fix-modified-indicator.patch.moved.
Conflict adding file debian/patches/fix-save-after-undo.patch.  Moved existing file to debian/patches/fix-save-after-undo.patch.moved.
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/oneiric/meld/oneiric-201109300511
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+77645@code.launchpad.net

Description of the change

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/oneiric/meld reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/meld/oneiric-201109300511. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

To post a comment you must log in.

Unmerged revisions

29. By Luke Yelavich

releasing version 1.5.2-1ubuntu1

28. By Luke Yelavich

Merge branch lp:~jtaylor/ubuntu/oneiric/meld/fix-two-undo-bugs

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2=== added file 'debian/patches/fix-modified-indicator.patch'
3--- debian/patches/fix-modified-indicator.patch 1970-01-01 00:00:00 +0000
4+++ debian/patches/fix-modified-indicator.patch 2011-09-30 05:16:25 +0000
5@@ -0,0 +1,32 @@
6+From 7cf7d4f663bb9e329a2ee877975eb257260fcdc4 Mon Sep 17 00:00:00 2001
7+From: Kai Willadsen <kai.willadsen@gmail.com>
8+Date: Sun, 4 Sep 2011 08:04:19 +1000
9+Applied-Upstream: 7cf7d4f663bb9e329a2ee877975eb257260fcdc4
10+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=658022
11+Subject: Fix incorrect modified indicator on first undo (closes
12+ bgo#658022)
13+ The check for a checkpointed (i.e., saved) buffer was incorrect for the
14+ very first undo in a sequence. Due to a None-handling mishap, a
15+ checkpoint that should have ranged from 0:0 always ranged from 0:1.
16+---
17+ meld/undo.py | 4 +++-
18+ 1 files changed, 3 insertions(+), 1 deletions(-)
19+
20+diff --git a/meld/undo.py b/meld/undo.py
21+index ccad9a9..1ce925d 100644
22+--- a/meld/undo.py
23++++ b/meld/undo.py
24+@@ -193,7 +193,9 @@ class UndoSequence(gobject.GObject):
25+ start, end = self.checkpoints.get(buf, (None, None))
26+ if start is None:
27+ return False
28+- return start <= self.next_redo <= (end or len(self.actions))
29++ if end is None:
30++ end = len(self.actions)
31++ return start <= self.next_redo <= end
32+
33+ def begin_group(self):
34+ """Group several actions into a single logical action.
35+--
36+1.7.5.4
37+
38
39=== renamed file 'debian/patches/fix-modified-indicator.patch' => 'debian/patches/fix-modified-indicator.patch.moved'
40=== added file 'debian/patches/fix-save-after-undo.patch'
41--- debian/patches/fix-save-after-undo.patch 1970-01-01 00:00:00 +0000
42+++ debian/patches/fix-save-after-undo.patch 2011-09-30 05:16:25 +0000
43@@ -0,0 +1,28 @@
44+From: Julian Taylor <jtaylor.debian@googlemail.com>
45+Date: Sun, 14 Aug 2011 07:03:45 +1000
46+Applied-Upstream: 5f94be6667f87d0166b6fad2686e454980becc63
47+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=656292
48+Subject: Fix save-after-undo in certain conditions (closes
49+ bgo#656292)
50+
51+---
52+ meld/undo.py | 3 ++-
53+ 1 files changed, 2 insertions(+), 1 deletions(-)
54+
55+diff --git a/meld/undo.py b/meld/undo.py
56+index 31e948d..ccad9a9 100644
57+--- a/meld/undo.py
58++++ b/meld/undo.py
59+@@ -179,7 +179,8 @@ class UndoSequence(gobject.GObject):
60+ while start > 0 and self.actions[start - 1].buffer != buf:
61+ start -= 1
62+ end = self.next_redo
63+- while end < len(self.actions) and self.actions[end + 1].buffer != buf:
64++ while end < len(self.actions) - 1 and \
65++ self.actions[end + 1].buffer != buf:
66+ end += 1
67+ if end == len(self.actions):
68+ end = None
69+--
70+1.7.5.4
71+
72
73=== renamed file 'debian/patches/fix-save-after-undo.patch' => 'debian/patches/fix-save-after-undo.patch.moved'

Subscribers

People subscribed via source and target branches

to all changes: