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

Merge and reverse merge dont seem to cancel out

From: JetMark <extrapic_at_extrapic.com>
Date: Tue, 22 Jul 2008 08:26:14 -0700 (PDT)

If I do
svn merge -r12:13 repository/branch
A f1
A f2
A f3

I get the addition of 3 files - exactly what I expected in the
circumstances.

but if I now do

svn merge -r13:12 repository/branch
I get
Skipped 'f1'
Skipped 'f2'
Skipped 'f3'

(And the files are not removed in the working copy.)
It seems that the unmerge does not manage to undo a merge. What else do you
have to do to ensure that this happens ?

Can anyone say what I am doing wrong?

-- 
View this message in context: http://www.nabble.com/Merge-and-reverse-merge-dont-seem-to-cancel-out-tp18591959p18591959.html
Sent from the Subversion Users mailing list archive at Nabble.com.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-07-22 17:26:42 CEST

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.