Fossil

Differences From Artifact [d127ea2bc2]:

• File src/import.c — part of check-in [50705503d9] at 2017-02-10 22:04:06 on branch roy-export — Add --rename-master option to import --git instead of forcing a naming convention. (user: roy.marples size: 60677)

To Artifact [b4a56c13c4]:

• File src/import.c — part of check-in [9501d941d5] at 2017-02-10 22:07:34 on branch roy-export — Set the main-branch config option to the trunk name we're using. (user: roy.marples size: 60736)

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)"
       ");"