diff options
| author | Raja R Harinath <harinath@hurrynot.org> | 2010-08-23 23:49:54 +0530 |
|---|---|---|
| committer | Raja R Harinath <harinath@hurrynot.org> | 2010-08-24 00:23:11 +0530 |
| commit | 71625191032d380c962b3c13bf25c8d28125d54d (patch) | |
| tree | c2b41e481f896ca55884c4cf28a54819dfc1996e /src/main.cpp | |
| parent | 008b28e0f4c48de8d740c51c053020d1a36315bf (diff) | |
| parent | a9851327eaa451820fbf90ed9d3f62441314cbb9 (diff) | |
| download | svn2git-71625191032d380c962b3c13bf25c8d28125d54d.tar svn2git-71625191032d380c962b3c13bf25c8d28125d54d.tar.gz svn2git-71625191032d380c962b3c13bf25c8d28125d54d.tar.bz2 svn2git-71625191032d380c962b3c13bf25c8d28125d54d.tar.xz svn2git-71625191032d380c962b3c13bf25c8d28125d54d.zip | |
Merge branch 'master' of git://gitorious.org/svn2git/svn2git
The conflict was mainly around two different approaches to fixing the linear
commitMarks issue. The precise tracking of commit marks per branch is better,
and that's how I resolved the merge conflict.
While at it, I also removed the "revision-*" files, since the "log-*" files
already have the same information, and the branch information too.
Conflicts:
src/repository.cpp
src/repository.h
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index 3feb3cf..f2b189e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -43,7 +43,11 @@ QHash<QByteArray, QByteArray> loadIdentityMapFile(const QString &fileName) } while (!file.atEnd()) { - QByteArray line = file.readLine().trimmed(); + QByteArray line = file.readLine(); + int comment_pos = line.indexOf('#'); + if (comment_pos != -1) + line.truncate(comment_pos); + line = line.trimmed(); int space = line.indexOf(' '); if (space == -1) continue; // invalid line |