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

Merge problem

From: Sergey Popov <psg1_at_quest4data.com>
Date: 2005-08-30 12:39:05 CEST

Hello!

I've got the following problem:

1) I create a branch: trunk > branches\branch1
2) Then I deleted branches\branch1\dir
3) Then I created branches\branch1\dir
4) Then I tried to perform merge branches\branch1 928:HEAD > trunk, and I
got the following error message:
Revision 928 doesn't match existing revision 946 in (working copy)\dir

How can I solve it?

Sergey Popov.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Aug 30 12:41:12 2005

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