Hi Caolán, a) yes, this is the best way. b) No idea. Maybe it's some side effect of the "tree conflict detection" logic in svn-1.6.1 Any interesting diagnostics around this file in the merge log?
Heiner Caolán McNamara wrote: > 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. > > C. > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] > -- Jens-Heiner Rechtien [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
