Le mercredi 25 novembre 2009 08:50, Bert Wesarg a écrit : > Patch(1) has recently changed the message for a failed merge from 'UNMERGED' > to 'NOT MERGED' (See commit 87f54e80 in the patch repository). Adopt this > change to quilt push's color matcher. > > Signed-off-by: Bert Wesarg <[email protected]> > > --- > quilt/push.in | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/quilt/push.in b/quilt/push.in > index c953e01..cca0681 100644 > --- a/quilt/push.in > +++ b/quilt/push.in > @@ -72,7 +72,7 @@ colorize() > { > if [ -n "$opt_color" ]; then > awk ' > - { if (/FAILED|hunks? ignored|can'\''t find file|file .* already > exists|UNMERGED/) > + { if (/FAILED|hunks? ignored|can'\''t find file|file .* already > exists|NOT MERGED/) > print "'$color_patch_fail'" $0 "'$color_clear'" > else if (/already applied$/) > print "'$color_patch_fuzz'" $0 "'$color_clear'"
Err, this will then fail for everyone using older versions of patch, won't it? Don't we instead want to catch both "UNMERGED" and "NOT MERGED"? -- Jean Delvare Suse L3 _______________________________________________ Quilt-dev mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/quilt-dev
