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

Re: Merge issues.

From: Mark Phippard <MarkP_at_softlanding.com>
Date: 2005-01-26 22:11:04 CET

"Carter Thompson" <cthompso@outerbay.com> wrote on 01/26/2005 03:56:41 PM:

> I'm just not getting it.
> I created a branch of a subdirectory in subversion at revision 25,
> made a change of a file at revision 26 on the new branch. I also
> made some changes to the file on the trunk in order to create
> a conflict, that was revision 27. Now I need to merge the two
> changes together on the trunk and it's not working.
> File: UIResources.properties
> --------26------- ui-rel-1.0 branch
> /
> /
> ---24--25/----------------27----- trunk
> cd trunk
> svn update
> At revision 27.
> svn merge -r26:27
> http://subversion/svn/prodops/branches/ui-rel-1.0/src/com/outerbay/ui/UI
> Resources.properties
> http://subversion/svn/prodops/trunk/adm-suite/ui/src/com/outerbay/ui/UIR
> esources.properties
> What am I doing wrong?

Read this:


This is what you would probably want:

cd trunk
svn update
svn merge -r25:HEAD http://subversion/svn/prodops/branches/ui-rel-1.0

This would cause all of the changes made on the branch to merged into your
WC of trunk. You then review the merge, resolve conflicts, and commit.


Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jan 26 22:18:14 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.