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/Plugins/ReqDocInfoPlugin.pm
--- Merging r862 through r970 into 'TWiki/Plugins/BugzillaQueryPlugin.pm':
G TWiki/Plugins/BugzillaQueryPlugin.pm
--- Merging r862 through r970 into 'TWiki/Plugins/ReqErrorPlugin.pm':
G TWiki/Plugins/ReqErrorPlugin.pm
--- Merging r862 through r970 into 'TWiki/Plugins/ReqNewDocPlugin.pm':
G TWiki/Plugins/ReqNewDocPlugin.pm
--- Merging r862 through r970 into 'TWiki/Plugins':
C TWiki/Plugins/ReqMarkupPlugin/ReqMarkupPlugin.txt
--- Merging r862 through r970 into 'TWiki/Plugins/ReqMarkupPlugin.pm':
G TWiki/Plugins/ReqMarkupPlugin.pm
--- Merging r862 through r970 into 'TWiki/Plugins/ReqNewReqMarkupPlugin.pm':
CG TWiki/Plugins/ReqNewReqMarkupPlugin.pm
--- Merging r862 through r970 into 'TWiki/Plugins':
G TWiki/Plugins
--- Merging r862 through r970 into 'TWiki/Contrib':
C TWiki/Contrib/Dude/Utilities/MyConfig.pm
C TWiki/Contrib/Dude/RM/ExportProcessor
C TWiki/Contrib/Dude/RM/ConfigFiles/RmReqtTemplateStrings.txt
G TWiki/Contrib
Summary of conflicts:
Text conflicts: 3
Tree conflicts: 2
% svn update
U TWiki/Plugins/ReqMarkupPlugin/ReqMarkupPlugin.txt
U TWiki/Plugins/ReqNewReqMarkupPlugin.pm
U TWiki/Contrib/Dude/Utilities/MyConfig.pm
Updated to revision 970.
--
Mark
"Blessed is he who finds happiness in his own foolishness, for he will
always be happy."
Received on 2010-03-01 21:45:20 CET