As mentionned in the previous mail, this is a private repo.
Using "stderr=PIPE" and printing "err.read()" says the following. I new I
had seen a "no commit message?" at some point :)
Any idea why would that one commit fail, and not all the previous ones ?
16:00:13 [I] Updating "trunk" in "/homelocal/ydirson/test/trunk-in"
16:00:13 [I] Applying pending upstream changesets
16:00:13 [I] Changeset "2006-05-09 09:40:55 by csousbie"
16:00:13 [I] Log message: #65 cahier d'int?gration : ajout de "synchronize"
devant la methode erHandleMessageInfoCommande
16:00:13 [I] /homelocal/ydirson/test/trunk-in $ git commit -a -F -
16:00:14 [W] [Status 1]
16:00:14 [C] Couldn't replay changeset
16:00:14 [C] Upstream change application failed
Failure applying upstream changes: /homelocal/ydirson/test/trunk-in $ git
commit -a -F - returned status 1 saying * no commit message? aborting
commit.
|---------+------------------------------>
| | Lele Gaifax |
| | <[EMAIL PROTECTED]|
| | ip.net> |
| | |
| | |
| | 29/05/2006 15:03 |
| | Remis le : |
| | 29/05/2006 15:03 |
| | |
|---------+------------------------------>
>------------------------------------------------------------------------------------------------------------------|
|
|
| Pour : Yann DIRSON <[EMAIL PROTECTED]>
|
| cc : "[email protected]" <[email protected]>
|
| Objet : Re: Réf. : Re: tailor error (cvs->git)
|
|
|
>------------------------------------------------------------------------------------------------------------------|
Yann please, use the ML where there are people more expert than me on
git related issues.
Yann DIRSON wrote:
> It fails in the same place, with the same log. /me wonders why I thought
I
> read the problem came from the log message :(
>
> $ ~/tools/git/tailor-0.9.23/tailor --configfile
> /homelocal/ydirson/test/tailor.conf
> 14:08:03 [I] Updating "project" in "/homelocal/ydirson/test/root"
> 14:08:04 [I] Applying pending upstream changesets
> 14:08:04 [I] Changeset "2006-05-09 09:40:55 by csousbie"
> 14:08:04 [I] Log message: #65 cahier d'int?gration : ajout de
"synchronize"
> devant la methode erHandleMessageInfoCommande
> 14:08:04 [I] /homelocal/ydirson/test/root $ git commit -a -F -
> 14:08:04 [W] [Status 1]
> 14:08:04 [C] Couldn't replay changeset
> 14:08:04 [C] Upstream change application failed
> Failure applying upstream changes: /homelocal/ydirson/test/root $ git
> commit -a -F - returned status 1
>
>
> I tried to force displaying stderr using "(out, err) =
> c.execute(stdout=PIPE, env=env, input=logmessage)" and showing "err" it
on
> failure in _commit, but it is "None".
You need to add also a "stderr=STDOUT" and change the very first import
to include also the STDOUT symbol. So, the first import becomes:
from shwrap import ExternalCommand, \
ReopenableNamedTemporaryFile, PIPE, STDOUT
while the execute becomes:
(out, err) = c.execute(stdout=PIPE, stderr=STDOUT, env=env,
input=logmessage)
Search for "STDOUT" in the other sources for examples.
> If I cd there and run "git commit -a -F -" and feed the commit message
> myself, it does proceed.
> Then if I rerun tailor, it proceeds with the remaining patchsets.
>
> Probably unrelated, looking at the mixed cvs/git repo, I find it strange
in
> many places subdirectories are not referenced in CVS/Entries files.
>
> Any idea where to look ? I'm no python expert...
Any chance of being able to retry it from here? Is the CVS repo private
stuff?
ciao, lele.
_______________________________________________
Tailor mailing list
[email protected]
http://lists.zooko.com/mailman/listinfo/tailor
