im...@gmail.com]
Sent: maandag 1 maart 2010 21:45
To: users@subversion.apache.org
Subject: merge BASE:HEAD vs update
I use svn merge -r BASE:HEAD --dry-run . to check what an update will do to
me. Today, it predicted all kinds of trouble, but then update worked just
fine. Why is that?
I use *svn merge -r BASE:HEAD --dry-run .* to check what an update will do
to me. Today, it predicted all kinds of trouble, but then update worked
just fine. Why is that?
% svn merge -r BASE:HEAD --dry-run .
--- Merging r862 through r970 into 'TWiki/Plugins/ReqDocInfoPlugin.pm':
G TWiki/Plugi