@@ -127,7 +127,7 @@ class FastImportRepository : public Repository
127
127
/* starts at 0, and counts up. */
128
128
mark_t last_commit_mark;
129
129
130
- /* starts at maxMark and counts down. Reset after each SVN revision */
130
+ /* starts at maxMark - 1 and counts down. Reset after each SVN revision */
131
131
mark_t next_file_mark;
132
132
133
133
bool processHasStarted;
@@ -267,7 +267,7 @@ static QString marksFileName(QString name)
267
267
268
268
FastImportRepository::FastImportRepository (const Rules::Repository &rule)
269
269
: name(rule.name), prefix(rule.forwardTo), fastImport(name), commitCount(0 ), outstandingTransactions(0 ),
270
- last_commit_mark(0 ), next_file_mark(maxMark), processHasStarted(false )
270
+ last_commit_mark(0 ), next_file_mark(maxMark - 1 ), processHasStarted(false )
271
271
{
272
272
foreach (Rules::Repository::Branch branchRule, rule.branches ) {
273
273
Branch branch;
@@ -515,7 +515,7 @@ void FastImportRepository::reloadBranches()
515
515
516
516
startFastImport ();
517
517
fastImport.write (" reset refs/notes/commits\n from :" +
518
- QByteArray::number (maxMark + 1 ) +
518
+ QByteArray::number (maxMark) +
519
519
" \n " );
520
520
}
521
521
}
@@ -662,7 +662,7 @@ Repository::Transaction *FastImportRepository::newTransaction(const QString &bra
662
662
void FastImportRepository::forgetTransaction (Transaction *)
663
663
{
664
664
if (!--outstandingTransactions)
665
- next_file_mark = maxMark;
665
+ next_file_mark = maxMark - 1 ;
666
666
}
667
667
668
668
void FastImportRepository::createAnnotatedTag (const QString &ref, const QString &svnprefix,
@@ -946,7 +946,7 @@ void FastImportRepository::Transaction::commitNote(const QByteArray ¬eText, b
946
946
947
947
QByteArray s (" " );
948
948
s.append (" commit refs/notes/commits\n " );
949
- s.append (" mark :" + QByteArray::number (maxMark + 1 ) + " \n " );
949
+ s.append (" mark :" + QByteArray::number (maxMark) + " \n " );
950
950
s.append (" committer " + author + " " + QString::number (datetime) + " +0000" + " \n " );
951
951
s.append (" data " + QString::number (message.length ()) + " \n " );
952
952
s.append (message + " \n " );
0 commit comments