Hi Caolán,

> So I have a workspace that I resynced to m47, and I've ended up with,
> e.g both
> vcl/source/fontsubset/sft.c
> and
> vcl/source/fontsubset/sft.cxx
> while only sft.cxx appears in m47.
> 
> So
> a) is the best way to resolve this by myself manually svn deleting sft.c
> and friends in my own cws ?
> b) how come it ended up this way ? cws resyncing with svn seems to
> constantly baffle me.

had the same problem in one of my CWSes, after resyncing to m47: 8 (or
so) files in vcl/source/fontsubset were still there, though they were
deleted in MWS. Interestingly, the log for "cws rebase -m" showed the
files were scheduled for deletion, but in the log for "cws rebase -C",
they do not appear at all.

I think this is some SVN bug, and I wonder how many such files - deleted
on MWS, but silently re-introduced in a rebased CWS - we already have ...

Ciao
Frank

-- 
- Frank Schönheit, Software Engineer         [email protected] -
- Sun Microsystems                      http://www.sun.com/staroffice -
- OpenOffice.org Base                       http://dba.openoffice.org -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to