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

Did I hose myself with merge?

From: Denise Howard <dhoward_at_pgp.com>
Date: 2005-04-13 21:29:22 CEST

I've pored over Chapter 4 of the book and am still looking for the answer to
my problem. I just recently decided to take advantage of Subversion's
branch capability, and I'm afraid I may have painted myself into a corner.

Rev. 2089: I created a branch from the trunk, named 'token'.
Rev. 2139: I allegedly synced to the trunk, via 'svn merge -r 2089:2139
/svnroot/myproject/trunk' My branch version is now 2140. I got several
"Skipped missing target' messages, which I didn't fully understand.

Does this pick up all the changes in the revisions in between, or not? If
not, how do I sync up with all the others so that I don't get those
messages? Surely I don't have to apply each individual revision

Rev. 2192: I've done several more commits to my branch, and want to sync up
with the trunk again. My branch version is now 2154, so I do 'svn merge -r
2154:2192 /svnroot/myproject/trunk'. Many more "Skipped missing target"
messages result, along with a number of conflicts.

Now I'm scared. How do I resolve this cleanly? If I apply any particular
revision, won't I run the risk of adding back files that are supposed to be
deleted, clobbering changes, and causing conflicts?


This message could have been secured by PGP Universal. To secure
future messages from this sender, please click this link:


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Apr 13 21:40:11 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.