Fossil SCM
Set the main-branch config option to the trunk name we're using.
Commit
9501d941d5c16462f045858d842630622acfe27d
Parent
50705503d944380…
1 file changed
+4
-1
+4
-1
| --- src/import.c | ||
| +++ src/import.c | ||
| @@ -1697,11 +1697,14 @@ | ||
| 1697 | 1697 | } |
| 1698 | 1698 | db_open_repository(g.argv[2]); |
| 1699 | 1699 | db_open_config(0, 0); |
| 1700 | 1700 | |
| 1701 | 1701 | db_begin_transaction(); |
| 1702 | - if( !incrFlag ) db_initial_setup(0, 0, 0); | |
| 1702 | + if( !incrFlag ){ | |
| 1703 | + db_initial_setup(0, 0, 0); | |
| 1704 | + db_set("main-branch", gimport.zTrunkName, 0); | |
| 1705 | + } | |
| 1703 | 1706 | |
| 1704 | 1707 | if( svnFlag ){ |
| 1705 | 1708 | db_multi_exec( |
| 1706 | 1709 | "CREATE TEMP TABLE xrevisions(" |
| 1707 | 1710 | " trev INTEGER, tbranch INT, trid INT, tparent INT DEFAULT 0," |
| 1708 | 1711 |
| --- src/import.c | |
| +++ src/import.c | |
| @@ -1697,11 +1697,14 @@ | |
| 1697 | } |
| 1698 | db_open_repository(g.argv[2]); |
| 1699 | db_open_config(0, 0); |
| 1700 | |
| 1701 | db_begin_transaction(); |
| 1702 | if( !incrFlag ) db_initial_setup(0, 0, 0); |
| 1703 | |
| 1704 | if( svnFlag ){ |
| 1705 | db_multi_exec( |
| 1706 | "CREATE TEMP TABLE xrevisions(" |
| 1707 | " trev INTEGER, tbranch INT, trid INT, tparent INT DEFAULT 0," |
| 1708 |
| --- src/import.c | |
| +++ src/import.c | |
| @@ -1697,11 +1697,14 @@ | |
| 1697 | } |
| 1698 | db_open_repository(g.argv[2]); |
| 1699 | db_open_config(0, 0); |
| 1700 | |
| 1701 | db_begin_transaction(); |
| 1702 | if( !incrFlag ){ |
| 1703 | db_initial_setup(0, 0, 0); |
| 1704 | db_set("main-branch", gimport.zTrunkName, 0); |
| 1705 | } |
| 1706 | |
| 1707 | if( svnFlag ){ |
| 1708 | db_multi_exec( |
| 1709 | "CREATE TEMP TABLE xrevisions(" |
| 1710 | " trev INTEGER, tbranch INT, trid INT, tparent INT DEFAULT 0," |
| 1711 |