[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Vendor branch merge problem

From: Lars Albertsson <lalle_at_sics.se>
Date: 2004-03-08 14:38:30 CET

I have a project that uses the libcwd library, so I imported it
(version 0.99.28) with a vendor drop. I then imported it into my
project, and removed some files that were part of the libcwd
distribution, but I'd like to generate them from sources. One of them
is libcwd/configure.

A few months later, I make a vendor drop of libcwd 0.99.32, and would
like to import the changes between 0.99.28 and 0.99.32 into my
project. So I find my working copy and cd to the directory above
libcwd and type:

snaga:lib> svn --dry-run merge \
  http://saruman.sics.se/svn/vendor/libcwd/0.99.28 \
  http://saruman.sics.se/svn/vendor/libcwd/0.99.32 libcwd
U libcwd/bfd.cc
svn: Use --force to override this restriction
svn: 'libcwd/configure' is not under version control

snaga:lib> svn --force --dry-run merge \
  http://saruman.sics.se/svn/vendor/libcwd/0.99.28 \
  http://saruman.sics.se/svn/vendor/libcwd/0.99.32 libcwd
U libcwd/bfd.cc
svn: Use --force to override this restriction
svn: 'libcwd/configure' is not under version control

I tried without the --dry-run argument, and it makes no
difference. There is no libcwd/configure file in the working copy. I'm
using svn 1.0.0 on x86 redhat 8 (client) and 1.0.0 on x86 redhat 9
(server).

I tried to reproduce this with a simpler test case in order to avoid
distributing the repository, but with a simpler case doing what I
believed to be a similar sequence, svn reports "Skipped missing
target: libcwd/configure", which makes sense.

Does anybody have a hint on what I can do in order to debug the
problem, minimise it to a smaller test case, or work around it? If
someone wants to look at it, I can give private access to the
repository, or send a dump.

BTW, aren't the messages in backward order?

/Lalle

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Mar 8 14:38:55 2004

This is an archived mail posted to the Subversion Users mailing list.