Fossil

Check-in [9501d941]
Login

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

Overview
Comment:Set the main-branch config option to the trunk name we're using.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | roy-export
Files: files | file ages | folders
SHA1:9501d941d5c16462f045858d842630622acfe27d
User & Date: roy.marples 2017-02-10 22:07:34
Context
2017-02-12
15:17
Match committer / tag name <email> with a user's contact info record. If not found, then use the email address as the user name. check-in: 8f901ff5 user: roy.marples tags: roy-export
2017-02-10
22:07
Set the main-branch config option to the trunk name we're using. check-in: 9501d941 user: roy.marples tags: roy-export
22:04
Add --rename-master option to import --git instead of forcing a naming convention. check-in: 50705503 user: roy.marples tags: roy-export
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/import.c.

1695
1696
1697
1698
1699
1700
1701

1702


1703
1704
1705
1706
1707
1708
1709
    if( forceFlag ) file_delete(g.argv[2]);
    db_create_repository(g.argv[2]);
  }
  db_open_repository(g.argv[2]);
  db_open_config(0, 0);

  db_begin_transaction();

  if( !incrFlag ) db_initial_setup(0, 0, 0);



  if( svnFlag ){
    db_multi_exec(
       "CREATE TEMP TABLE xrevisions("
       " trev INTEGER, tbranch INT, trid INT, tparent INT DEFAULT 0,"
       " UNIQUE(tbranch, trev)"
       ");"







>
|
>
>







1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
    if( forceFlag ) file_delete(g.argv[2]);
    db_create_repository(g.argv[2]);
  }
  db_open_repository(g.argv[2]);
  db_open_config(0, 0);

  db_begin_transaction();
  if( !incrFlag ){
    db_initial_setup(0, 0, 0);
    db_set("main-branch", gimport.zTrunkName, 0);
  }

  if( svnFlag ){
    db_multi_exec(
       "CREATE TEMP TABLE xrevisions("
       " trev INTEGER, tbranch INT, trid INT, tparent INT DEFAULT 0,"
       " UNIQUE(tbranch, trev)"
       ");"