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 problems. RE is currently contemplating an client/server upgrade, 1.5.5 will probably not be mandatory though. Alternative would be to wait for 1.6.x which seems to have a warning mechanism for the infamous tree conflicts (aka I lost my changes after moving a file) Heiner Juergen Schmidt wrote: > 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. Updated svx/uiconfig/layouts and got the problem > again. After a second look i noticed that it is now not > "svx/uiconfig/layout/delzip" but "sw/uiconfig/layout/delzip" > Please note the little difference between svx and sw and update both ;-) > > Juergen > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@openoffice.org > For additional commands, e-mail: dev-h...@openoffice.org > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@openoffice.org For additional commands, e-mail: dev-h...@openoffice.org
