Fossil

Check-in [5488f7dd]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix name of trunk when using --trunk option
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | svn-import
Files: files | file ages | folders
SHA1:5488f7dd825620487edf30d6a6e06125944831f7
User & Date: baruch 2014-11-05 09:36:39
Context
2014-11-05
15:37
fixes for various edge cases check-in: c9fb495e user: baruch tags: svn-import
09:36
Fix name of trunk when using --trunk option check-in: 5488f7dd user: baruch tags: svn-import
09:12
Merge latest trunk check-in: fef7e1f9 user: baruch tags: svn-import
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/import.c.

1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
      lenBranch = zTemp-(zPath+nFilter+gsvn.lenBranches);
      zTemp = zPath+nFilter+gsvn.lenBranches;
      zBranch = fossil_malloc(lenBranch+1);
      memcpy(zBranch, zTemp, lenBranch);
      zBranch[lenBranch] = '\0';
    }else
    if( strncmp(zPath+nFilter, gsvn.zTrunk, gsvn.lenTrunk-1)==0 ){
      zBranch = fossil_malloc(gsvn.lenTrunk);
      memcpy(zBranch, gsvn.zTrunk, gsvn.lenTrunk-1);
      zBranch[gsvn.lenTrunk-1] = '\0';
    }
  }
  return zBranch;
}

/*
** Read the svn-dump format from pIn and insert the corresponding







|
<
<







1103
1104
1105
1106
1107
1108
1109
1110


1111
1112
1113
1114
1115
1116
1117
      lenBranch = zTemp-(zPath+nFilter+gsvn.lenBranches);
      zTemp = zPath+nFilter+gsvn.lenBranches;
      zBranch = fossil_malloc(lenBranch+1);
      memcpy(zBranch, zTemp, lenBranch);
      zBranch[lenBranch] = '\0';
    }else
    if( strncmp(zPath+nFilter, gsvn.zTrunk, gsvn.lenTrunk-1)==0 ){
      zBranch = mprintf("trunk");


    }
  }
  return zBranch;
}

/*
** Read the svn-dump format from pIn and insert the corresponding