On 6. 12. 2008, at 20:45, Frank Schönheit - Sun Microsystems Germany
wrote:
Hi Stephan,
So, back to good old manual merging: Remember which files you moved
in your CWS, and after every rebase, check whether they miss any
changes to the original files. Sigh.
With the additional hurdle that nobody will warn you about the lost
changes. If the compiler finds them, that's fine, but if you just
lose a
small bug fix, then may not notice this at all.
Yes,
$ /opt/local/bin/svn log -v --stop-on-copy | grep ' (from ' | egrep -v
'^ A /cws/sb102([^ ]*) \(from /trunk\1:[0-9]+\)$' | sed -E 's!^ A /
cws/sb102/([^ ]+) \(from /cws/sb102/(.+):[0-9]+\)$!/opt/local/bin/svn
merge -r 1:264807 svn+ssh://[EMAIL PROTECTED]/ooo/trunk/
[EMAIL PROTECTED] \1!' > doit ; . doit
did the trick for me now (as crude as it may be), but you definitely
don't want to remember to execute such a jumbo on every rebase...
-Stephan
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
