[issue1981] Error when transplanting
ruharen
bugs at mercurial.selenic.com
Mon Jan 11 12:21:52 UTC 2010
New submission from ruharen <ruharen at gmail.com>:
I got an error when doing a transplant between two branches in my repository.
I've atacched a text file with log and TraceBack.
I was using Mercurial 1.4.1 from TortoiseHG on Windows XP.
The command I issued was "hg transplant -b 12".
What I wanted to do is transplant some changes (not all, so a merge was not
useful) in a previous branch, to a new head I created later, in order to
rearrange history to correct a mistake I did adding files initially.
I updated to revision 1, and added the files I mistakenly had ignored. Then
tried to transplant the changes I did while developing.
I don't know if i could achieve what I want in a better way, but the problem
is that a got hit with an ugly error while transplanting.
PS: PLease tell me if more information is needed.
----------
files: transplanterror.txt
messages: 11428
nosy: ruharen
priority: bug
status: unread
title: Error when transplanting
____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue1981>
____________________________________________________
-------------- next part --------------
D:\Desarrollo\aincar\Copia de MaquinasEuro_TipoE>hg transplant -b 12
changeset: 1:b2c99732957e
user: User
date: Tue Jan 05 16:31:37 2010 +0100
summary: a±adir comentarios al proceso de contabilizacion de recaudaciones
apply changeset? [ynmpcq?]: y
changeset: 2:df7dddb59704
user: User
date: Thu Jan 07 12:04:12 2010 +0100
summary: corregir error en listado de maquinas por zonas: no se ponian a cero los contadores cuando era necesario
apply changeset? [ynmpcq?]: y
changeset: 3:2011cf9e78cc
user: User
date: Thu Jan 07 13:39:00 2010 +0100
summary: cambiar minusculas a mayusculas
apply changeset? [ynmpcq?]: y
changeset: 4:d915086a4d31
user: User
date: Thu Jan 07 13:39:28 2010 +0100
summary: Corregir redondeo de calculo de importes en el mantenimiento de recaudaciones
apply changeset? [ynmpcq?]: y
changeset: 5:fb5d5468ca44
user: User
date: Thu Jan 07 13:49:13 2010 +0100
summary: volver a cambiar minusculas a mayusculas
apply changeset? [ynmpcq?]: y
changeset: 6:c3622f815e65
user: User
date: Thu Jan 07 13:51:29 2010 +0100
summary: eliminar lineas duplicadas
apply changeset? [ynmpcq?]: y
changeset: 7:116c2d58509e
user: User
date: Fri Jan 08 09:59:24 2010 +0100
summary: cambiar servidor a servidor de produccion
apply changeset? [ynmpcq?]: y
changeset: 8:a8ab2d479759
user: User
date: Fri Jan 08 12:41:21 2010 +0100
summary: a±adir .bak a ficheros de ignore
apply changeset? [ynmpcq?]: y
changeset: 9:a57bb0bfaa9a
user: User
date: Fri Jan 08 12:41:54 2010 +0100
summary: a±adir else
apply changeset? [ynmpcq?]: y
changeset: 10:6e87b6f7028c
user: User
date: Fri Jan 08 12:42:28 2010 +0100
summary: modificacion y reestructuracion del proceso de contabilizacion
apply changeset? [ynmpcq?]: y
changeset: 11:17a7dfe759af
user: User
date: Fri Jan 08 19:15:27 2010 +0100
summary: no obtener columnas que no quermeos mostrar ni necesitamos sus datos en la pantalla de mantenimiento de facturaciones
apply changeset? [ynmpcq?]: y
changeset: 12:743e1cf4f40c
user: User
date: Mon Jan 11 09:42:18 2010 +0100
summary: evitar que se recalculen al cargar los importes de recaudacion al editar una recaudacion
apply changeset? [ynmpcq?]: y
applying b2c99732957e
b2c99732957e transplanted to 4e9d516f36fc
applying df7dddb59704
df7dddb59704 transplanted to 511a6538105e
applying 2011cf9e78cc
2011cf9e78cc transplanted to 13d33718336f
applying d915086a4d31
d915086a4d31 transplanted to 79fa09b84833
applying fb5d5468ca44
applying c3622f815e65
c3622f815e65 transplanted to 0d897fc7b47a
applying 116c2d58509e
116c2d58509e transplanted to 0c2d10dbc20d
applying a8ab2d479759
patching file .hgignore
Hunk #1 succeeded at 3 with fuzz 1 (offset -1 lines).
a8ab2d479759 transplanted to 8ebde2ed42af
applying a57bb0bfaa9a
a57bb0bfaa9a transplanted to 1968970500ac
applying 6e87b6f7028c
6e87b6f7028c transplanted to 169d43d4b99f
applying 17a7dfe759af
17a7dfe759af transplanted to 93bd589a02e7
applying 743e1cf4f40c
743e1cf4f40c transplanted to f136501910a8
** unknown exception encountered, details follow
** report bug details to http://mercurial.selenic.com/bts/
** or mercurial at selenic.com
** Mercurial Distributed SCM (version 1.4.2)
** Extensions loaded: extdiff, mq, highlight, interhg, graphlog, children, record, rebase, transplant
Traceback (most recent call last):
File "hg", line 36, in <module>
File "mercurial\dispatch.pyo", line 16, in run
File "mercurial\dispatch.pyo", line 30, in dispatch
File "mercurial\dispatch.pyo", line 46, in _runcatch
File "mercurial\dispatch.pyo", line 454, in _dispatch
File "mercurial\dispatch.pyo", line 324, in runcommand
File "mercurial\dispatch.pyo", line 505, in _runcommand
File "mercurial\dispatch.pyo", line 459, in checkargs
File "mercurial\dispatch.pyo", line 453, in <lambda>
File "mercurial\util.pyo", line 386, in check
File "hgext\transplant.pyo", line 584, in transplant
File "hgext\transplant.pyo", line 170, in apply
File "hgext\transplant.pyo", line 51, in write
apply changeset? [ynmpcq?]: y
changeset: 9:a57bb0bfaa9a
user: User
date: Fri Jan 08 12:41:54 2010 +0100
summary: a±adir else
apply changeset? [ynmpcq?]: y
changeset: 10:6e87b6f7028c
user: User
date: Fri Jan 08 12:42:28 2010 +0100
summary: modificacion y reestructuracion del proceso de contabilizacion
apply changeset? [ynmpcq?]: y
changeset: 11:17a7dfe759af
user: User
date: Fri Jan 08 19:15:27 2010 +0100
summary: no obtener columnas que no quermeos mostrar ni necesitamos sus dato
s en la pantalla de mantenimiento de facturaciones
apply changeset? [ynmpcq?]: y
changeset: 12:743e1cf4f40c
user: User
date: Mon Jan 11 09:42:18 2010 +0100
summary: evitar que se recalculen al cargar los importes de recaudacion al e
ditar una recaudacion
apply changeset? [ynmpcq?]: y
applying b2c99732957e
b2c99732957e transplanted to 4e9d516f36fc
applying df7dddb59704
df7dddb59704 transplanted to 511a6538105e
applying 2011cf9e78cc
2011cf9e78cc transplanted to 13d33718336f
applying d915086a4d31
d915086a4d31 transplanted to 79fa09b84833
applying fb5d5468ca44
applying c3622f815e65
c3622f815e65 transplanted to 0d897fc7b47a
applying 116c2d58509e
116c2d58509e transplanted to 0c2d10dbc20d
applying a8ab2d479759
patching file .hgignore
Hunk #1 succeeded at 3 with fuzz 1 (offset -1 lines).
a8ab2d479759 transplanted to 8ebde2ed42af
applying a57bb0bfaa9a
a57bb0bfaa9a transplanted to 1968970500ac
applying 6e87b6f7028c
6e87b6f7028c transplanted to 169d43d4b99f
applying 17a7dfe759af
17a7dfe759af transplanted to 93bd589a02e7
applying 743e1cf4f40c
743e1cf4f40c transplanted to f136501910a8
** unknown exception encountered, details follow
** report bug details to http://mercurial.selenic.com/bts/
** or mercurial at selenic.com
** Mercurial Distributed SCM (version 1.4.2)
** Extensions loaded: extdiff, mq, highlight, interhg, graphlog, children, record, rebase, transplant
Traceback (most recent call last):
File "hg", line 36, in <module>
File "mercurial\dispatch.pyo", line 16, in run
File "mercurial\dispatch.pyo", line 30, in dispatch
File "mercurial\dispatch.pyo", line 46, in _runcatch
File "mercurial\dispatch.pyo", line 454, in _dispatch
File "mercurial\dispatch.pyo", line 324, in runcommand
File "mercurial\dispatch.pyo", line 505, in _runcommand
File "mercurial\dispatch.pyo", line 459, in checkargs
File "mercurial\dispatch.pyo", line 453, in <lambda>
File "mercurial\util.pyo", line 386, in check
File "hgext\transplant.pyo", line 584, in transplant
File "hgext\transplant.pyo", line 170, in apply
File "hgext\transplant.pyo", line 51, in write
More information about the Mercurial-devel
mailing list