#76: hGetLine error after two conflicts
--------------------+-------------------------------------------------------
Reporter: keturn | Owner: lele
Type: defect | Status: new
Priority: major | Milestone: VersionOne
Component: tailor | Version: 0.9
Keywords: |
--------------------+-------------------------------------------------------
I got an error, "hGetLine: end of file." but after pulling the
problematic patch myself, it continued on okay.
{{{
$ ./tailor --configfile ~/tailor-openid/tailor-openid.ini --debug
16:25:18 [I] Updating "darcs-to-svn" in "/home/kevint/tailor-openid/try"
16:25:18 [I] $ svn ls file:///home/kevint/openid.net-test
trunk/
16:25:18 [I] [Ok]
16:25:18 [I] Applying pending upstream changesets
16:25:18 [I] Changeset "server.server.AssociateRequest.fromQuery: use non-
default DH modulus and gen when provided. Fixes #923."
16:25:18 [I] /home/kevint/tailor-openid/try/darcside $ darcs pull --all
--quiet --match "hash
20060414171843-04611-929fc9de29d3ed1fd3c8f93a3345e89644b261af.gz"
16:25:56 [W] [Status 1]
Output stream:
We have conflicts in the following files:
./openid/server/server.py ./test/server.py
Merging file ./openid/server/server.py by hand.
Running command 'emerge3 /tmp/version1/./openid/server/server.py
/tmp/version2/./openid/server/server.py
/tmp/ancestor/./openid/server/server.py
/tmp/merged/./openid/server/server.py'
Hit return to move on...Merging file ./test/server.py by hand.
Running command 'emerge3 /tmp/version1/./test/server.py
/tmp/version2/./test/server.py /tmp/ancestor/./test/server.py
/tmp/merged/./test/server.py'
Hit return to move on...darcs: <stdin>: hGetLine: end of file
16:25:56 [C] Couldn't apply changeset
16:25:56 [C] Upstream change application failed
Failure applying upstream changes: /home/kevint/tailor-openid/try/darcside
$ darcs pull --all --quiet --match "hash
20060414171843-04611-929fc9de29d3ed1fd3c8f93a3345e89644b261af.gz" returned
status 1 saying
We have conflicts in the following files:
./openid/server/server.py ./test/server.py
Merging file ./openid/server/server.py by hand.
Running command 'emerge3 /tmp/version1/./openid/server/server.py
/tmp/version2/./openid/server/server.py
/tmp/ancestor/./openid/server/server.py
/tmp/merged/./openid/server/server.py'
Hit return to move on...Merging file ./test/server.py by hand.
Running command 'emerge3 /tmp/version1/./test/server.py
/tmp/version2/./test/server.py /tmp/ancestor/./test/server.py
/tmp/merged/./test/server.py'
Hit return to move on...darcs: <stdin>: hGetLine: end of file
}}}
--
Ticket URL: <http://progetti.arstecnica.it/tailor/ticket/76>
Tailor <http://progetti.arstecnica.it/tailor>
An inter-VCs changeset exchanger_______________________________________________
Tailor mailing list
[email protected]
http://lists.zooko.com/mailman/listinfo/tailor
