Created by Ubuntu Package Importer and last modified
Get this branch:
bzr branch lp:ubuntu/natty-proposed/meld
Members of Ubuntu branches can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Ubuntu branches
Review team:
Ubuntu Development Team

Recent revisions

27. By Per Ångström

* debian/patches/fix-slow-bzr-start.patch (LP: #988296)
  - Fix slow meld startup on opening complex Bazaar repositories

26. By Julian Taylor

* debian/patches/fix_iteration.patch
  - Fix hangup when comparing some files (LP: #774265)
* debian/patches/fix-786134.patch
  - Fix another hangup when comparing some files (LP: #786134)
* debian/patches/fix-svn-external-crash.patch
  - Fix crash when svn wc contains externals (LP: #787831)
* debian/patches/fix-vcs-cwd.patch
  - allow opening vcs diff from outside of vcs-dir (LP: #770549)

25. By Robert Ancell

* New upstream release

[ Iain Buclaw ]
* debian/patches/diff_tree_store.patch:
  - Fix crash trying to insert integers into a text column (LP: #703603)

24. By Balint Reczey

* New upstream release
* Drop fix-chinese-translation.patch as it has been integrated upstream

23. By Balint Reczey

[ Balint Reczey ]
* debian/control.in:
  - Standards-Version is 3.9.1, no changes needed.

[Adam Collard]
* fix-chinese-translation.patch: stolen from upstream's GIT. Fix a crash
  when launching meld in a zh_CN environment. (Closes: #595025)

22. By Adam Collard

fix-chinese-translation.patch: stolen from upstream's GIT. Fix a crash
when launching meld in a zh_CN environment. (LP: #622065)

21. By Balint Reczey

[ Josselin Mouette ]
* vcs-crash.patch: stolen upstream. Fix a crash when using CVS, svn or
  git. Closes: #584554.

[ Balint Reczey ]
* New upstream release
  - Added support for diffing a file and a directory (Closes: #567340)
  - Translation updates (Thanks to Holger Wansing) (Closes: #313985)
  - vcs-crash.patch: removed, included upstream.
* run meld using /usr/bin/python instead of env python (Closes: #551189)

20. By Mackenzie Morgan

* Merge meld 1.3.1 from Debian Unstable (LP: #417369)
* New upstream release (Closes: #562989)
  - Speed up file comparisons and highlighting, significantly improving
    interactive editing performance (Closes: #309070)
  - Modifier keys not reset when focus change (Closes: #470781)
  - Version control filter updates (Closes: #506386)
  - Warp the text cursor to the start of jumped-to diff chunks
    (Closes: #523571)
  - Add RCS support (Closes: #432928)
  - Make CTRL+D and CTRL+E position the cursor(Closes: #523572)
  - Don't stop comparing dirs on read permission error (Closes: #530496)
  - Make Save-on-exit dialog clearer (Closes: #392124)
* Drop pythonpath.patch as it has been integrated upstream
* debian/copyright:
  - Update email of the author (Closes: #531632)
* debian/control.in:
  - Recommend python-gtksourceview2 (Closes: #544840)
  - Add Vcs-* fields
  - Standards-Version is 3.8.4, no changes needed.
* debian/source/format,
  - Convert to source format 3.0 (quilt).
* debian/patches/sourceview-package.patch:
  - Refreshed to apply cleanly.
* debian/pycompat:
  - Removed, not needed.

19. By Mackenzie Morgan

Merging shared upstream rev into target branch.

18. By MattJ

* Backport fix from upstream GIT for UI glitches (LP: #505285)
  - 01-invisible-merge-arrows-base.patch: changes required by next patch
  - 02-invisible-merge-arrows.patch: fix missing arrows in a 3 way comparison

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.