Thanks, Ben; however I'm certain the 'error' dir is only in the branch
and not the trunk - and when I tried this from the SVN command line to
give you the output, it simply worked; but reports "skipped missing" on
'svn merge --dry-run'.
>In your particular case, it sounds like both the left-tree and
>right-tree that are being compared already contain the "error"
>directory, but the working copy does not. The merge command won't
>magically auto-create files and dirs for you unless the left-hand tree
>*doesn't* contain the item and the right-hand tree *does* contain the
>item.
The "error" directories are added in revision 391; I was comparing
between revisions on the branch from 368 to HEAD (406) so it does
include the creation of these.
Some playing around revealed that with the svn command line, using
"--dry-run" will give similar "skipped missing" output but *without*
"--dry-run" it simply performs the addition. A bit odd, but it is now
merged for me.
At some point I'll try this again from TortoiseSVN, if it doesn't work
where SVN does, I'll post to the appropriate list.
Ignore from here on if you're not interested in the odd outputs...
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
If it's of interest, here's the two outputs performed one immediately
after the other (I'd a backup copy of the Working Copy, so it's at
exactly the state from the earlier email)
* With "--dry-run" skips missing targets
* Without that option, the merge adds the directory and files.
Would this be the expected behaviour?
Output
~~~~~~
D:\Dev\sen_65>svn merge --dry-run -r 368:HEAD
svn://nibelsorinoco/sentry/branches/localization
C snmx\src\snmx\evex.c
U sen_mgr\macros\fxm_admin.defpoll.m
U sen_mgr\macros\fxm_map.new.m
U sen_mgr\macros\fxm_tool.user.m
U sen_mgr\macros\fxm_btable.m
U sen_mgr\macros\fxm_winnt.diskfree.m
U sen_mgr\macros\fxm_winnt.ps.m
U sen_mgr\macros\fxm_winnt.netstat.m
U sen_mgr\macros\fxm_winnt.svc.m
U sen_mgr\macros\fxm_admin.java.m
U sen_mgr\macros\fxm_winnt.cpu.m
U sen_mgr\scripts\cgi\fxm_admin.defpoll.s
U sen_mgr\scripts\cgi\fxm_map.new.s
U sen_mgr\scripts\cgi\fxm_map.top.s
U sen_mgr\scripts\cgi\fxm_tool.user.s
U sen_mgr\scripts\cgi\fxm_admin.deftr.s
U sen_mgr\scripts\cgi\fxm_trend.cat.s
U sen_mgr\scripts\cgi\fxm_browser.s
U sen_mgr\scripts\cgi\fxm_btable.s
U sen_mgr\scripts\cgi\fxm_winnt.diskfree.s
U sen_mgr\scripts\cgi\fxm_winnt.filesys.s
U sen_mgr\scripts\cgi\fxm_winnt.ps.s
U sen_mgr\scripts\cgi\fxm_winnt.netstat.s
U sen_mgr\scripts\cgi\fxm_mac.edit.s
U sen_mgr\scripts\cgi\fxm_winnt.svc.s
U sen_mgr\scripts\cgi\fxm_admin.defscr.s
U sen_mgr\scripts\cgi\fxm_admin.java.s
U sen_mgr\scripts\cgi\fxm_winnt.vmstat.s
U sen_mgr\scripts\cgi\fxm_mac.util.s
U sen_mgr\scripts\cgi\fxm_winnt.cpu.s
C sen_mgr\scripts\cgi\fxm_alarmdb.delete.s
A sen_mgr\html\error
Skipped missing target: 'sen_mgr\html\error\key-error.html'
Skipped missing target: 'sen_mgr\html\error\expired.html'
Skipped missing target: 'sen_mgr\html\error\disk-error.html'
Skipped missing target: 'sen_mgr\html\error\clock-error.html'
Skipped missing target: 'sen_mgr\html\error\path-error.html'
Skipped missing target: 'sen_mgr\html\error\timeout.html'
Skipped missing target: 'sen_mgr\html\error\HEADER.html'
Skipped missing target: 'sen_mgr\html\error\key-mismatch.html'
U sen_mgr\install\conf\menuset.db
D:\Dev\sen_65>svn merge -r 368:HEAD
svn://nibelsorinoco/sentry/branches/localization
C snmx\src\snmx\evex.c
U sen_mgr\macros\fxm_admin.defpoll.m
U sen_mgr\macros\fxm_map.new.m
U sen_mgr\macros\fxm_tool.user.m
U sen_mgr\macros\fxm_btable.m
U sen_mgr\macros\fxm_winnt.diskfree.m
U sen_mgr\macros\fxm_winnt.ps.m
U sen_mgr\macros\fxm_winnt.netstat.m
U sen_mgr\macros\fxm_winnt.svc.m
U sen_mgr\macros\fxm_admin.java.m
U sen_mgr\macros\fxm_winnt.cpu.m
U sen_mgr\scripts\cgi\fxm_admin.defpoll.s
U sen_mgr\scripts\cgi\fxm_map.new.s
U sen_mgr\scripts\cgi\fxm_map.top.s
U sen_mgr\scripts\cgi\fxm_tool.user.s
U sen_mgr\scripts\cgi\fxm_admin.deftr.s
U sen_mgr\scripts\cgi\fxm_trend.cat.s
U sen_mgr\scripts\cgi\fxm_browser.s
U sen_mgr\scripts\cgi\fxm_btable.s
U sen_mgr\scripts\cgi\fxm_winnt.diskfree.s
U sen_mgr\scripts\cgi\fxm_winnt.filesys.s
U sen_mgr\scripts\cgi\fxm_winnt.ps.s
U sen_mgr\scripts\cgi\fxm_winnt.netstat.s
U sen_mgr\scripts\cgi\fxm_mac.edit.s
U sen_mgr\scripts\cgi\fxm_winnt.svc.s
U sen_mgr\scripts\cgi\fxm_admin.defscr.s
U sen_mgr\scripts\cgi\fxm_admin.java.s
U sen_mgr\scripts\cgi\fxm_winnt.vmstat.s
U sen_mgr\scripts\cgi\fxm_mac.util.s
U sen_mgr\scripts\cgi\fxm_winnt.cpu.s
C sen_mgr\scripts\cgi\fxm_alarmdb.delete.s
A sen_mgr\html\error
A sen_mgr\html\error\key-error.html
A sen_mgr\html\error\expired.html
A sen_mgr\html\error\disk-error.html
A sen_mgr\html\error\clock-error.html
A sen_mgr\html\error\path-error.html
A sen_mgr\html\error\timeout.html
A sen_mgr\html\error\HEADER.html
A sen_mgr\html\error\key-mismatch.html
U sen_mgr\install\conf\menuset.db
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Mar 3 16:41:38 2005