#56: cvsps source cannot read patches from a branch
---------------------+------------------------------------------------------
Reporter: ydirson | Owner: lele
Type: defect | Status: new
Priority: major | Milestone: VersionOne
Component: cvsps | Version: 0.9
Keywords: |
---------------------+------------------------------------------------------
Using this config:
{{{
[DEFAULT]
patch-name-format=%(firstlogline)s
remove-first-log-line=True
# that one seems necessary to force ordering
projects = trunk-pull, branch-pull
[trunk-pull]
root-directory = /export/work/yann/tailor/test/rootps
source = cvsps:bigdiesel
target = git:bigdiesel
start-revision = INITIAL
state-file = trunk-pull.state
subdir = trunk
[branch-pull]
root-directory = /export/work/yann/tailor/test/rootps
source = cvsps:bigdiesel
target = git:bigdiesel-branch
#start-revision = INITIAL
start-revision = bigloo-parser INITIAL
state-file = branch-pull.state
subdir = bigloo-parser
[cvsps:bigdiesel]
repository = :pserver:[EMAIL PROTECTED]:/sources/dsssl-
utils
module = dsssl-utils/bigdiesel
[git:bigdiesel]
[git:bigdiesel-branch]
parent-repo = ../trunk
parent-rev = ec3b45d3733129f88422c3983b82a4fcc943a760
}}}
tailorizing "branch-pull" (after having tailorized trunk-pull) gives:
{{{
$ ./tailor/tailor -v --configfile test/bigdiesel-cvsps.tailor
23:42:49 [I] Updating "trunk-pull" in
"/export/work/yann/tailor/test/rootps"
23:42:49 [I] $ cvsps --cvs-direct -u -b HEAD --root
:pserver:[EMAIL PROTECTED]:/sources/dsssl-utils dsssl-
utils/bigdiesel
23:42:52 [I] [Ok]
23:42:52 [I] Cached information about 0 pending changesets
23:42:52 [I] Update completed with no upstream changes
23:42:52 [I] Bootstrapping "branch-pull" in
"/export/work/yann/tailor/test/rootps"
23:42:52 [I] /export/work/yann/tailor/test/rootps/bigloo-parser $ git
clone --shared -n ../trunk tmp
23:42:52 [I] [Ok]
23:42:52 [I] /export/work/yann/tailor/test/rootps/bigloo-parser $ git
reset --soft bigloo-parser_branchpoint
23:42:52 [I] [Ok]
23:42:52 [C] Checkout of branch-pull failed!
Traceback (most recent call last):
File "./tailor/tailor", line 33, in ?
main()
File "/export/work/yann/tailor/tailor/vcpx/tailor.py", line 334, in main
tailorizer()
File "/export/work/yann/tailor/tailor/vcpx/tailor.py", line 143, in
__call__
self.bootstrap()
File "/export/work/yann/tailor/tailor/vcpx/tailor.py", line 71, in
bootstrap
actual = dwd.checkoutUpstreamRevision(revision)
File "/export/work/yann/tailor/tailor/vcpx/source.py", line 245, in
checkoutUpstreamRevision
last = self._checkoutUpstreamRevision(revision)
File "/export/work/yann/tailor/tailor/vcpx/cvsps.py", line 310, in
_checkoutUpstreamRevision
csets = self.getPendingChangesets(revision)
File "/export/work/yann/tailor/tailor/vcpx/source.py", line 213, in
getPendingChangesets
self.state_file.setPendingChangesets(changesets)
File "/export/work/yann/tailor/tailor/vcpx/statefile.py", line 253, in
setPendingChangesets
self._write(changesets)
File "/export/work/yann/tailor/tailor/vcpx/statefile.py", line 86, in
_write
for cs in changesets:
File "/export/work/yann/tailor/tailor/vcpx/cvsps.py", line 160, in
_getUpstreamChangesets
sincerev = int(sincerev)
ValueError: invalid literal for int(): bigloo-parser
}}}
Requesting the trunk instead of the branch does not show this failure.
--
Ticket URL: <http://progetti.arstecnica.it/tailor/ticket/56>
Tailor <http://progetti.arstecnica.it/tailor>
An inter-VCs changeset exchanger_______________________________________________
Tailor mailing list
[email protected]
http://lists.zooko.com/mailman/listinfo/tailor
