Hello community, here is the log from the commit of package wiggle for openSUSE:Factory checked in at 2012-05-21 07:33:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wiggle (Old) and /work/SRC/openSUSE:Factory/.wiggle.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wiggle", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/wiggle/wiggle.changes 2012-02-15 16:01:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.wiggle.new/wiggle.changes 2012-05-21 07:33:08.000000000 +0200 @@ -1,0 +2,10 @@ +Tue May 15 03:15:27 UTC 2012 - [email protected] + +- New upstream release 0.9. + Numerous bugfixes for edge cases, + lots of improvements to --browser mode which + is now documented + new --show-wiggle flag to make it easier to + see what wiggle is trying to do + +------------------------------------------------------------------- Old: ---- wiggle-0.8.tar.gz wiggle-overflow.patch New: ---- fix_conflicts_in_browser wiggle-0.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wiggle.spec ++++++ --- /var/tmp/diff_new_pack.gPwzPa/_old 2012-05-21 07:33:10.000000000 +0200 +++ /var/tmp/diff_new_pack.gPwzPa/_new 2012-05-21 07:33:10.000000000 +0200 @@ -21,12 +21,12 @@ Summary: A Tool for Applying Patches with Conflicts License: GPL-2.0+ Group: Productivity/Text/Utilities -Version: 0.8 +Version: 0.9 Release: 0 Url: http://neil.brown.name/wiggle/ Source0: http://neil.brown.name/wiggle/%{name}-%{version}.tar.gz -Patch1: wiggle-overflow.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch0: fix_conflicts_in_browser %description Wiggle is a program for applying patches that 'patch' cannot apply due @@ -45,14 +45,13 @@ %prep %setup -q -%patch1 -p0 +%patch0 -p1 %build make BINDIR=/usr/bin \ MANDIR=%{_mandir} MAN1DIR=%{_mandir}/man1 \ - CFLAGS="$RPM_OPT_FLAGS" \ + CFLAGS="-I. $RPM_OPT_FLAGS" \ wiggle - #MAN5DIR=%{_mandir}/man5 %install rm -rf $RPM_BUILD_ROOT @@ -62,7 +61,6 @@ MANDIR=$RPM_BUILD_ROOT%{_mandir} \ MAN1DIR=$RPM_BUILD_ROOT%{_mandir}/man1 \ install - # MAN5DIR=$RPM_BUILD_ROOT%{_mandir}/man5 %clean rm -rf $RPM_BUILD_ROOT @@ -72,6 +70,5 @@ /usr/bin/wiggle %doc %{_mandir}/man1/wiggle.1* %doc ANNOUNCE TODO -#%doc p p.help %changelog ++++++ fix_conflicts_in_browser ++++++ >From 0da9cb2c412ad27802788bdb5e23854f2478dbe6 Mon Sep 17 00:00:00 2001 From: NeilBrown <[email protected]> Date: Tue, 15 May 2012 19:31:47 +1000 Subject: [PATCH] Browser: fix in_conflict detection while browsing. I forget to consider 'hi' and 'lo'. Signed-off-by: NeilBrown <[email protected]> diff --git a/vpatch.c b/vpatch.c index 44aa898..93102bc 100644 --- a/vpatch.c +++ b/vpatch.c @@ -577,7 +577,9 @@ static int check_line(struct mpos pos, struct file fm, struct file fb, rv |= WIGGLED; else if (m[pos.p.m].type == Unmatched) unmatched = 1; - if (m[pos.p.m].in_conflict) + if (m[pos.p.m].in_conflict && + (pos.p.o < m[pos.p.m].lo || + pos.p.o > m[pos.p.m].hi)) rv |= CONFLICTED | CHANGES; e = prev_melmnt(&pos.p, fm, fb, fa, m); } while (e.start != NULL && ++++++ wiggle-0.8.tar.gz -> wiggle-0.9.tar.gz ++++++ ++++ 70133 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
