Re: Merging question

"Francois Beausoleil" <fbos@users.sourceforge.net> writes:

> Here's the line I executed:
> E:\harry>svn merge --dry-run file:///repos/trunk_at_12
> file:///repos/trunk_at_HEAD
> src\java\core\net\sourceforge\jgb\builder\Builder.java

OK, I'm going to back up a step... I'm suddenly perplexed by the
output of 'svn merge':

$ cd svn/subversion/libsvn_fs/bdb

$ svn merge -r6000:HEAD http://svn.collab.net/repos/svn/branches/fs-schema-changes/subversion/libsvn_fs/bdb
C copies-table.c
U copies-table.h
   strings-table.c
   strings-table.h
   changes-table.c

$ svn st
C copies-table.c
? copies-table.c.merge-left.r6000
? copies-table.c.merge-right.r6360
? copies-table.c.working
M copies-table.h

... why on earth are three files being printed out with no code at
all? They seem to be "no-ops"...? This is cryptic and mysterious
behavior. 'svn merge --dry-run' shows the exact same output.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jun 26 19:32:00 2003