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

Revision x doesn't match existing revision y in z

From: Casper Hornstrup <ch_at_csh-consult.dk>
Date: 2005-02-26 10:03:12 CET

Why does this happen when merging changes from trunk to branch?
I suspect it's because we deleted the winebuild directory
in trunk after the branch was created. If so, why can't
Subversion just replace the directory? How can we fix the problem?

svn merge -r13566:13667 svn://svn.reactos.com/trunk/reactos/tools
D winebuild\res32.c
D winebuild\spec32.c
D winebuild\res16.c
D winebuild\utils.c
D winebuild\Makefile.in
D winebuild\spec16.c
D winebuild\mkstemps.c
D winebuild\build.h
D winebuild\import.c
D winebuild\relay.c
D winebuild\winehq2ros.patch
D winebuild\winglue.h
D winebuild\winebuild.man.in
D winebuild\main.c
D winebuild\parser.c
D winebuild\Makefile
D winebuild
svn: Revision 13667 doesn't match existing revision 13567 in


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Feb 27 04:30:31 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.