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

Re: Problems with merge - nothing happens?

From: Walden Mathews <walden_at_eqwality.com>
Date: 2004-11-09 23:51:57 CET

| If I do this:
|
| svn diff $R/pos/tags/pos.AUTH_RETALIX_R1_2_P10 $R/pos/trunk
|
| I see a list of differences. What I want to do is take the differences
| from the tagged branch, and merge them with the code on the trunk

There are basically two useful things you can do with merge
and these two branches, and a working copy of the trunk:

(1) you can apply changes made in the branch to your
    trunk. "svn merge -rN:M branch ."

(2) you can make your trunk look exactly like the head of
    your branch. "svn merge trunk branch ."

Which one are you trying to do?

Walden Mathews

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Nov 9 23:52:38 2004

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