Changeset e4ff92f4 in git


Ignore:
Timestamp:
10/03/15 00:48:36 (5 years ago)
Author:
Olly Betts <olly@…>
Branches:
line_contents, master, stereo, travis-osx
Children:
f6c07ba
Parents:
69f54b0
git-author:
Olly Betts <olly@…> (10/03/15 00:45:44)
git-committer:
Olly Betts <olly@…> (10/03/15 00:48:36)
Message:

lib/launchpad-merge-po: Sync merging at blank lines between
messages.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r69f54b0 re4ff92f4  
     1Tue Mar 10 00:45:15 GMT 2015  Olly Betts <olly@survex.com>
     2
     3        * lib/launchpad-merge-po: Sync merging at blank lines between
     4          messages.
     5
    16Tue Mar 10 00:05:29 GMT 2015  Olly Betts <olly@survex.com>
    27
  • lib/launchpad-merge-po

    r69f54b0 re4ff92f4  
    1111    $o //= <O>;
    1212    $n //= <N>;
     13    defined $o and $o =~ s/[ \t]+$//;
     14    defined $n and $n =~ s/[ \t]+$//;
    1315    if (!defined $n) {
    1416        last unless defined $o;
     
    2527    }
    2628
    27     if ($o eq '' || $n eq '') {
     29    if ($o eq "\n" || $n eq "\n") {
    2830        $fuzzy = 0;
    2931    }
     
    5557        print $o;
    5658        $n = $o = undef;
     59        next;
     60    }
     61
     62    if ($o eq "\n") {
     63        print '+' if $diff;
     64        print $n;
     65        $n = undef;
     66        next;
     67    }
     68
     69    if ($n eq "\n") {
     70        print '-$o' if $diff;
     71        $o = undef;
    5772        next;
    5873    }
Note: See TracChangeset for help on using the changeset viewer.