Kohei Yoshida wrote:
On Mon, 2009-01-05 at 10:52 -0500, Kohei Yoshida wrote:
I'm now checking out the cws once again to do a fresh rebase, to see
if
that works.
And this worked! Still not sure what the problem was that prevented the
rebase in the first place.
Kohei
i had the same problem.
Jürgen,
thanks for pointing this out. The problem is caused by SVN fooling up on
resurrected items. I found this in the change log for SVN 1.5.5
* fixed: broken merge if target's history includes resurrections
(r34385, -93)
Heiner
PS: svn 1.5.5 fixes a number of svn:mergeinfo related
I now remember again ...
The same may hold true for sw/uiconfig
Rüdiger
Jens-Heiner Rechtien wrote:
Hi,
the best way to resolve this problem (if you haven't change anything in
that area):
cd svx/uiconfig/
rm -rf layout
svn update
(which checks ouut the stuff again). This works because
Kohei Yoshida wrote:
On Tue, 2008-12-23 at 15:14 +, Caolán McNamara wrote:
i.e.
Transmitting file data ...svn: Commit failed (details
follow):
svn: While preparing
'WORKSPACE/officecfg/registry/schema/org/openoffice/Office/makefile.mk'
for commit
svn: File
On Mon, 2009-01-05 at 10:52 -0500, Kohei Yoshida wrote:
I'm now checking out the cws once again to do a fresh rebase, to see
if
that works.
And this worked! Still not sure what the problem was that prevented the
rebase in the first place.
Kohei
--
Kohei Yoshida - OpenOffice.org Engineer -
Hello Kohei,
Le 5 janv. 09 à 16:17, Kohei Yoshida a écrit :
On Tue, 2008-12-23 at 15:14 +, Caolán McNamara wrote:
i.e.
[...cut...]
svn: File '/cws/WORKSPACE/svx/uiconfig/layout/delzip' is out of date
cws: ERROR: The subversion command line client failed with exit
status
'1'
On Tue, 2008-12-23 at 15:14 +, Caolán McNamara wrote:
i.e.
Transmitting file data ...svn: Commit failed (details
follow):
svn: While preparing
'WORKSPACE/officecfg/registry/schema/org/openoffice/Office/makefile.mk'
for commit
svn: File
Hi,
the best way to resolve this problem (if you haven't change anything in
that area):
cd svx/uiconfig/
rm -rf layout
svn update
(which checks ouut the stuff again). This works because there was no
real change to this files, they just got accidentally deleted and readded.
Some very strange
On Mon, 2009-01-05 at 16:39 +0100, Rüdiger Timm wrote:
Does
rm /cws/WORKSPACE/svx/uiconfig/layout/delzip
svn update /cws/WORKSPACE/svx/uiconfig/layout/delzip
help?
I have no idea what exactly is going wrong here. The only good thing is
that 'delzip' files are flag files only. Just
i.e.
Transmitting file data ...svn: Commit failed (details
follow):
svn: While preparing
'WORKSPACE/officecfg/registry/schema/org/openoffice/Office/makefile.mk'
for commit
svn: File '/cws/WORKSPACE/svx/uiconfig/layout/delzip' is out of date
cws: ERROR: The subversion command line
10 matches
Mail list logo