Skip to content

Commit c1a11c6

Browse files
Vampiretnyblom
authored andcommitted
Use maxMark as mark for notes as maxMark + 1 is 0 and thus not a valid mark
1 parent 83d6f8d commit c1a11c6

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/repository.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ class FastImportRepository : public Repository
127127
/* starts at 0, and counts up. */
128128
mark_t last_commit_mark;
129129

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 */
131131
mark_t next_file_mark;
132132

133133
bool processHasStarted;
@@ -267,7 +267,7 @@ static QString marksFileName(QString name)
267267

268268
FastImportRepository::FastImportRepository(const Rules::Repository &rule)
269269
: 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)
271271
{
272272
foreach (Rules::Repository::Branch branchRule, rule.branches) {
273273
Branch branch;
@@ -515,7 +515,7 @@ void FastImportRepository::reloadBranches()
515515

516516
startFastImport();
517517
fastImport.write("reset refs/notes/commits\nfrom :" +
518-
QByteArray::number(maxMark + 1) +
518+
QByteArray::number(maxMark) +
519519
"\n");
520520
}
521521
}
@@ -662,7 +662,7 @@ Repository::Transaction *FastImportRepository::newTransaction(const QString &bra
662662
void FastImportRepository::forgetTransaction(Transaction *)
663663
{
664664
if (!--outstandingTransactions)
665-
next_file_mark = maxMark;
665+
next_file_mark = maxMark - 1;
666666
}
667667

668668
void FastImportRepository::createAnnotatedTag(const QString &ref, const QString &svnprefix,
@@ -946,7 +946,7 @@ void FastImportRepository::Transaction::commitNote(const QByteArray &noteText, b
946946

947947
QByteArray s("");
948948
s.append("commit refs/notes/commits\n");
949-
s.append("mark :" + QByteArray::number(maxMark + 1) + "\n");
949+
s.append("mark :" + QByteArray::number(maxMark) + "\n");
950950
s.append("committer " + author + " " + QString::number(datetime) + " +0000" + "\n");
951951
s.append("data " + QString::number(message.length()) + "\n");
952952
s.append(message + "\n");

0 commit comments

Comments
 (0)