1.1 --- a/vcs.profiles.teamware/src/org/netbeans/modules/vcs/profiles/teamware/util/SFile.java	Wed Nov 24 01:12:23 2004 +0000
     1.2 +++ b/vcs.profiles.teamware/src/org/netbeans/modules/vcs/profiles/teamware/util/SFile.java	Wed Nov 24 01:31:30 2004 +0000
     1.3 @@ -239,7 +239,7 @@
     1.4              int lineNumber = 1;
     1.5              int diffIndex = 0;
     1.6              int linesToDelete = 0;
     1.7 -            public void includeLine(String line) {
     1.8 +            private void checkDiffs() {
     1.9                  if (linesToDelete == 0 && diffIndex < diffs.length) {
    1.10                      if (diffs[diffIndex].getSecondStart() == lineNumber) {
    1.11                          Difference diff = diffs[diffIndex++];
    1.12 @@ -268,6 +268,9 @@
    1.13                          }
    1.14                      }
    1.15                  }
    1.16 +            }
    1.17 +            public void includeLine(String line) {
    1.18 +                checkDiffs();
    1.19                  sb.append(line);
    1.20                  sb.append("\n");
    1.21                  if (linesToDelete > 0) {
    1.22 @@ -285,6 +288,7 @@
    1.23                  sb.append("\n");
    1.24              }
    1.25              public void controlLine(char type, String sn) {
    1.26 +                checkDiffs();
    1.27                  sb.append("\u0001" + type + " " + sn + "\n");
    1.28              }
    1.29          };