Merge problem

[Sergey Popov <ps...@quest4data.com>]

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

Re: Merge problem

[Kalin KOZHUHAROV <ka...@thinrope.net>]

Sergey Popov wrote:
> 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?
You probably can do that iwth a peg revision.
   http://svnbook.red-bean.com/nightly/en/svn.advanced.pegrevs.html

Apart from that, just find the revision the new branch1 sprung into
existence:
   svn log --stop-on-copy branches/branch1
and repeat the merge from that revision.

Kalin.

-- 
|[ ~~~~~~~~~~~~~~~~~~~~~~ ]|
+-> http://ThinRope.net/ <-+
|[ ______________________ ]|



---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org