convert: try to be smarter about CVS branching
Better handles this case:
The output from cvsps -A -u --cvs-direct -q:
---------------------
PatchSet 1
Date: 2008/02/08 20:33:28
Author: fk
Branch: HEAD
Tag: (none)
Log:
initial
Members:
file_one:INITIAL->1.1
---------------------
PatchSet 2
Date: 2008/02/08 20:33:32
Author: fk
Branch: branch_name
Ancestor branch: HEAD
Tag: (none)
Log:
new file on branch
Members:
file_two:1.1->1.1.2.1
% commit date test
transaction abort!
rollback completed
abort: empty commit message
transaction abort!
rollback completed
abort: impossible time zone offset: 4444444
transaction abort!
rollback completed
abort: invalid date: '1\t15.1'
transaction abort!
rollback completed
abort: invalid date: 'foo bar'
nothing changed
% partial commit test
trouble committing bar!
abort: No such file or directory: .../test/bar
adding dir/file
dir/file
adding dir.file
abort: no match under directory .../test/dir!
abort: no match under directory .../test/bleh!
abort: no match under directory .../test/dir2!
dir/file
does-not-exist: No such file or directory
abort: file .../test/does-not-exist not found!
abort: file .../test/baz not tracked!
abort: file .../test/quux not tracked!
dir/file
% partial subdir commit test
adding bar/bar
adding foo/foo
% subdir log 1
changeset: 0:6ef3cb06bb80
user: test
date: Mon Jan 12 13:46:40 1970 +0000
files: foo/foo
description:
commit-subdir-1
% subdir log 2
changeset: 1:f2e51572cf5a
tag: tip
user: test
date: Mon Jan 12 13:46:41 1970 +0000
files: bar/bar
description:
commit-subdir-2
% full log
changeset: 1:f2e51572cf5a
tag: tip
user: test
date: Mon Jan 12 13:46:41 1970 +0000
files: bar/bar
description:
commit-subdir-2
changeset: 0:6ef3cb06bb80
user: test
date: Mon Jan 12 13:46:40 1970 +0000
files: foo/foo
description:
commit-subdir-1
% dot and subdir commit test
% full log
changeset: 1:d9180e04fa8a
tag: tip
user: test
date: Sat Jan 24 03:33:20 1970 +0000
files: foo/plain-file
description:
commit-foo-dot
changeset: 0:80b572aaf098
user: test
date: Mon Jan 12 13:46:40 1970 +0000
files: foo/plain-file
description:
commit-foo-subdir
% subdir log
changeset: 1:d9180e04fa8a
tag: tip
user: test
date: Sat Jan 24 03:33:20 1970 +0000
summary: commit-foo-dot
changeset: 0:80b572aaf098
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: commit-foo-subdir