Ticket #154 (closed defect: worksforme)
fails to convert clisp history from CVS to darcs
| Reported by: | zooko | Owned by: | lele |
|---|---|---|---|
| Priority: | major | Milestone: | VersionOne |
| Component: | cvs | Version: | 0.9 |
| Keywords: | Cc: |
Description (last modified by lele) (diff)
The tailor.config file:
[DEFAULT] remove-first-log-line = True verbose = True patch-name-format = %(firstlogline)s [project] target = darcs:target start-revision = INITIAL state-file = tailor.state source = cvs:source subdir = . [darcs:target] init-options = --darcs-2 [cvs:source] module = clisp repository = :pserver:anonymous@clisp.cvs.sourceforge.net:/cvsroot/clisp
The output ends with:
12:42:30 [I] /Users/wonwinmcbrootles/playground/e/clisp/tailored $ cvs -f -d :pserver:anonymous@clisp.cvs.sourceforge.net:/cvsroot/clisp -q update -d -r 1.139 src/ChangeLog
12:42:37 [I] [Ok]
12:42:37 [I] /Users/wonwinmcbrootles/playground/e/clisp/tailored $ darcs record --all --pipe
12:42:38 [I] [Ok]
12:42:38 [I] -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
12:42:38 [I] Changeset #230
12:42:38 [I] Changeset "1998-10-12 13:09:02 by haible"
12:42:38 [I] Log message: Add prototype declarations everywhere.
12:42:38 [I] /Users/wonwinmcbrootles/playground/e/clisp/tailored $ cvs -f -d :pserver:anonymous@clisp.cvs.sourceforge.net:/cvsroot/clisp -q update -d -r 1.1 src/readline/ChangeLog src/readline/ansi_proto.h src/readline/shell.h src/readline/xmalloc.h
12:42:40 [W] [Status 1]
12:42:40 [W] /Users/wonwinmcbrootles/playground/e/clisp/tailored $ cvs -f -d :pserver:anonymous@clisp.cvs.sourceforge.net:/cvsroot/clisp -q update -d -r 1.1 src/readline/ChangeLog src/readline/ansi_proto.h src/readline/shell.h src/readline/xmalloc.h returned status 1, retrying in 2 seconds...
12:42:41 [I] /Users/wonwinmcbrootles/playground/e/clisp/tailored $ cvs -f -d :pserver:anonymous@clisp.cvs.sourceforge.net:/cvsroot/clisp -q update -d -r 1.1 src/readline/ChangeLog src/readline/ansi_proto.h src/readline/shell.h src/readline/xmalloc.h
12:42:42 [W] [Status 1]
12:42:42 [W] /Users/wonwinmcbrootles/playground/e/clisp/tailored $ cvs -f -d :pserver:anonymous@clisp.cvs.sourceforge.net:/cvsroot/clisp -q update -d -r 1.1 src/readline/ChangeLog src/readline/ansi_proto.h src/readline/shell.h src/readline/xmalloc.h returned status 1, retrying in 4 seconds...
12:42:44 [I] /Users/wonwinmcbrootles/playground/e/clisp/tailored $ cvs -f -d :pserver:anonymous@clisp.cvs.sourceforge.net:/cvsroot/clisp -q update -d -r 1.1 src/readline/ChangeLog src/readline/ansi_proto.h src/readline/shell.h src/readline/xmalloc.h
12:42:45 [W] [Status 1]
12:42:45 [W] /Users/wonwinmcbrootles/playground/e/clisp/tailored $ cvs -f -d :pserver:anonymous@clisp.cvs.sourceforge.net:/cvsroot/clisp -q update -d -r 1.1 src/readline/ChangeLog src/readline/ansi_proto.h src/readline/shell.h src/readline/xmalloc.h returned status 1, retrying in 8 seconds...
12:42:48 [I] /Users/wonwinmcbrootles/playground/e/clisp/tailored $ cvs -f -d :pserver:anonymous@clisp.cvs.sourceforge.net:/cvsroot/clisp -q update -d -r 1.1 src/readline/ChangeLog src/readline/ansi_proto.h src/readline/shell.h src/readline/xmalloc.h
12:42:49 [W] [Status 1]
12:42:49 [C] Couldn't apply changeset
12:42:50 [C] Upstream change application failed
Traceback (most recent call last):
File "/usr/local/bin/tailor", line 8, in <module>
load_entry_point('tailor==0.9.31', 'console_scripts', 'tailor')()
File "/usr/local/stow/python-release25-maint-2008-05-15/lib/python2.5/site-packages/tailor-0.9.31-py2.5.egg/vcpx/tailor.py", line 342, in main
tailorizer()
File "/usr/local/stow/python-release25-maint-2008-05-15/lib/python2.5/site-packages/tailor-0.9.31-py2.5.egg/vcpx/tailor.py", line 147, in __call__
self.update()
File "/usr/local/stow/python-release25-maint-2008-05-15/lib/python2.5/site-packages/tailor-0.9.31-py2.5.egg/vcpx/tailor.py", line 111, in update
applyable=self._applyable, applied=self._applied)
File "/usr/local/stow/python-release25-maint-2008-05-15/lib/python2.5/site-packages/tailor-0.9.31-py2.5.egg/vcpx/dualwd.py", line 97, in applyPendingChangesets
applied=applied)
File "/usr/local/stow/python-release25-maint-2008-05-15/lib/python2.5/site-packages/tailor-0.9.31-py2.5.egg/vcpx/source.py", line 113, in applyPendingChangesets
res = self._applyChangeset(c)
File "/usr/local/stow/python-release25-maint-2008-05-15/lib/python2.5/site-packages/tailor-0.9.31-py2.5.egg/vcpx/repository/cvsps.py", line 372, in _applyChangeset
cvsup.exit_status))
vcpx.source.ChangesetApplicationFailure: /Users/wonwinmcbrootles/playground/e/clisp/tailored $ cvs -f -d :pserver:anonymous@clisp.cvs.sourceforge.net:/cvsroot/clisp -q update -d -r 1.1 src/readline/ChangeLog src/readline/ansi_proto.h src/readline/shell.h src/readline/xmalloc.h returned status 1
real 74m52.620s
user 5m30.156s
sys 3m50.761s
Change History
comment:1 Changed 5 years ago by lele
- Component changed from tailor to cvs
- Description modified (diff)
comment:2 Changed 5 years ago by lele
- Status changed from new to closed
- Resolution set to worksforme
Everything's working here. Maybe another MacOSX strangeness, like it was for #151?
Maybe you can spot the problem:
2008-05-20 17:50:09 INFO: Changeset #230 2008-05-20 17:50:09 INFO: Changeset "1998-10-12 13:09:02 by haible" 2008-05-20 17:50:09 INFO: Log message: Add prototype declarations everywhere. 2008-05-20 17:50:09 INFO: /tmp/t154 $ cvs -f -d :pserver:anonymous@clisp.cvs.sourceforge.net:/cvsroot/clisp -q update -d -P -r 1.1 src/readline/ChangeLog src/readline/ansi_proto.h src/readline/shell.h src/readline/xmalloc.h 2008-05-20 17:50:14 INFO: [Ok] 2008-05-20 17:50:14 INFO: /tmp/t154 $ cvs -f -d :pserver:anonymous@clisp.cvs.sourceforge.net:/cvsroot/clisp -q update -d -P -r 1.2 src/readline/Makefile.in src/readline/bind.c src/readline/callback.c src/readline/complete.c src/readline/display.c src/readline/funmap.c src/readline/histexpand.c src/readline/histfile.c src/readline/histlib.h src/readline/history.c src/readline/history.h src/readline/histsearch.c src/readline/input.c src/readline/isearch.c src/readline/keymaps.c src/readline/kill.c src/readline/macro.c src/readline/nls.c src/readline/parens.c src/readline/readline.c src/readline/readline.h src/readline/rltty.c src/readline/search.c src/readline/shell.c src/readline/signals.c src/readline/terminal.c src/readline/tilde.c src/readline/tilde.h src/readline/util.c src/readline/vi_mode.c src/readline/xmalloc.c 2008-05-20 17:50:21 INFO: [Ok] 2008-05-20 17:50:21 INFO: /tmp/t154 $ darcs add --case-ok --not-recursive --quiet src/readline/ChangeLog 2008-05-20 17:50:21 INFO: [Ok] 2008-05-20 17:50:21 INFO: /tmp/t154 $ darcs add --case-ok --not-recursive --quiet src/readline/ansi_proto.h 2008-05-20 17:50:22 INFO: [Ok] 2008-05-20 17:50:22 INFO: /tmp/t154 $ darcs add --case-ok --not-recursive --quiet src/readline/shell.h 2008-05-20 17:50:23 INFO: [Ok] 2008-05-20 17:50:23 INFO: /tmp/t154 $ darcs add --case-ok --not-recursive --quiet src/readline/xmalloc.h 2008-05-20 17:50:24 INFO: [Ok] 2008-05-20 17:50:24 INFO: /tmp/t154 $ darcs record --all --pipe 2008-05-20 17:50:26 INFO: [Ok] 2008-05-20 17:50:26 INFO: -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* 2008-05-20 17:50:26 INFO: Changeset #231 2008-05-20 17:50:26 INFO: Changeset "1998-10-12 13:11:10 by haible" 2008-05-20 17:50:26 INFO: Log message: Add rl_present_p. Change version string. 2008-05-20 17:50:26 INFO: /tmp/t154 $ cvs -f -d :pserver:anonymous@clisp.cvs.sourceforge.net:/cvsroot/clisp -q update -d -P -r 1.2 src/readline/ChangeLog 2008-05-20 17:50:32 INFO: [Ok] 2008-05-20 17:50:32 INFO: /tmp/t154 $ cvs -f -d :pserver:anonymous@clisp.cvs.sourceforge.net:/cvsroot/clisp -q update -d -P -r 1.3 src/readline/readline.c src/readline/readline.h 2008-05-20 17:50:37 INFO: [Ok] 2008-05-20 17:50:37 INFO: /tmp/t154 $ darcs record --all --pipe 2008-05-20 17:50:38 INFO: [Ok]
Tailor is still going, but I'll stop it shortly, just beyond patch #280...
comment:3 Changed 5 years ago by zooko
Confirmed that it has to do with two files with case-insensitively-identical named:
2008-05-20 13:10:43 INFO: /Users/wonwinmcbrootles/playground/e/clisp/tailored $ cvs -f -d :pserver:anonymous@clisp.cvs.sourceforge.net:/cvsroot/clisp -q update -d -P -r 1.1 src/readline/CHANGEL OG src/readline/CHANGES src/readline/COPYING src/readline/INSTALL src/readline/MANIFEST src/readline/MANIFEST.doc src/readline/Makefile.in src/readline/README src/readline/acconfig.h src/readline/a clocal.m4 src/readline/ansi_stdlib.h src/readline/bind.c src/readline/callback.c src/readline/chardefs.h src/readline/complete.c src/readline/config.h.in src/readline/configure src/readline/configu re.in src/readline/display.c src/readline/emacs_keymap.c src/readline/funmap.c src/readline/histexpand.c src/readline/histfile.c src/readline/histlib.h src/readline/history.c src/readline/history.h src/readline/histsearch.c src/readline/input.c src/readline/isearch.c src/readline/keymaps.c src/readline/keymaps.h src/readline/kill.c src/readline/macro.c src/readline/nls.c src/readline/parens. c src/readline/posixdir.h src/readline/posixjmp.h src/readline/posixstat.h src/readline/readline.c src/readline/readline.h src/readline/rlconf.h src/readline/rldefs.h src/readline/rltty.c src/readl ine/rltty.h src/readline/rlwinsize.h src/readline/search.c src/readline/shell.c src/readline/signals.c src/readline/tcap.h src/readline/terminal.c src/readline/tilde.c src/readline/tilde.h src/read line/undo.c src/readline/util.c src/readline/vi_keymap.c src/readline/vi_mode.c src/readline/xmalloc.c src/readline/doc/Makefile.in src/readline/doc/hist.texinfo src/readline/doc/history.dvi src/re adline/doc/history.html src/readline/doc/history.info src/readline/doc/history.ps src/readline/doc/history_toc.html src/readline/doc/hstech.texinfo src/readline/doc/hsuser.texinfo src/readline/doc/ readline.0 src/readline/doc/readline.3 src/readline/doc/readline.dvi src/readline/doc/readline.html src/readline/doc/readline.info src/readline/doc/readline.ps src/readline/doc/readline_toc.html sr c/readline/doc/rlman.texinfo src/readline/doc/rltech.texinfo src/readline/doc/rluser.texinfo src/readline/doc/texi2dvi src/readline/doc/texi2html src/readline/doc/texinfo.tex src/readline/examples/ Inputrc src/readline/examples/Makefile.in src/readline/examples/fileman.c src/readline/examples/histexamp.c src/readline/examples/manexamp.c src/readline/examples/rl.c src/readline/examples/rltest. c src/readline/support/config.guess src/readline/support/config.sub src/readline/support/install.sh src/readline/support/mkdirs src/readline/support/mkdist 2008-05-20 13:11:15 INFO: /Users/wonwinmcbrootles/playground/e/clisp/tailored $ darcs add --case-ok --not-recursive --quiet src/readline src/readline/CHANGELOG src/readline/CHANGES src/readline /COPYING src/readline/INSTALL src/readline/MANIFEST src/readline/MANIFEST.doc src/readline/Makefile.in src/readline/README src/readline/acconfig.h src/readline/aclocal.m4 src/readline/ansi_stdlib.h src/readline/bind.c src/readline/callback.c src/readline/chardefs.h src/readline/complete.c src/readline/config.h.in src/readline/configure src/readline/configure.in src/readline/display.c src/rea dline/emacs_keymap.c src/readline/funmap.c src/readline/histexpand.c src/readline/histfile.c src/readline/histlib.h src/readline/history.c src/readline/history.h src/readline/histsearch.c src/readl ine/input.c src/readline/isearch.c src/readline/keymaps.c src/readline/keymaps.h src/readline/kill.c src/readline/macro.c src/readline/nls.c src/readline/parens.c src/readline/posixdir.h src/readli ne/posixjmp.h src/readline/posixstat.h src/readline/readline.c src/readline/readline.h src/readline/rlconf.h src/readline/rldefs.h src/readline/rltty.c src/readline/rltty.h src/readline/rlwinsize.h src/readline/search.c src/readline/shell.c src/readline/signals.c src/readline/tcap.h src/readline/terminal.c src/readline/tilde.c src/readline/tilde.h src/readline/undo.c src/readline/util.c src/ readline/vi_keymap.c src/readline/vi_mode.c src/readline/xmalloc.c src/readline/doc src/readline/doc/Makefile.in src/readline/doc/hist.texinfo src/readline/doc/history.dvi src/readline/doc/history. html src/readline/doc/history.info src/readline/doc/history.ps src/readline/doc/history_toc.html src/readline/doc/hstech.texinfo src/readline/doc/hsuser.texinfo src/readline/doc/readline.0 src/read line/doc/readline.3 src/readline/doc/readline.dvi src/readline/doc/readline.html src/readline/doc/readline.info src/readline/doc/readline.ps src/readline/doc/readline_toc.html src/readline/doc/rlma n.texinfo src/readline/doc/rltech.texinfo src/readline/doc/rluser.texinfo src/readline/doc/texi2dvi src/readline/doc/texi2html src/readline/doc/texinfo.tex src/readline/examples src/readline/exampl es/Inputrc src/readline/examples/Makefile.in src/readline/examples/fileman.c src/readline/examples/histexamp.c src/readline/examples/manexamp.c src/readline/examples/rl.c src/readline/examples/rlte st.c src/readline/support src/readline/support/config.guess src/readline/support/config.sub src/readline/support/install.sh src/readline/support/mkdirs src/readline/support/mkdist 2008-05-20 13:11:51 INFO: /Users/wonwinmcbrootles/playground/e/clisp/tailored $ cvs -f -d :pserver:anonymous@clisp.cvs.sourceforge.net:/cvsroot/clisp -q update -d -P -r 1.1 src/readline/ChangeL og src/readline/ansi_proto.h src/readline/shell.h src/readline/xmalloc.h 2008-05-20 13:11:54 WARNING: /Users/wonwinmcbrootles/playground/e/clisp/tailored $ cvs -f -d :pserver:anonymous@clisp.cvs.sourceforge.net:/cvsroot/clisp -q update -d -P -r 1.1 src/readline/ChangeL og src/readline/ansi_proto.h src/readline/shell.h src/readline/xmalloc.h returned status 1, retrying in 2 seconds...
("changelog")
Note: See
TracTickets for help on using
tickets.

Markup