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

Re: Merge

From: Mark Phippard <MarkP_at_softlanding.com>
Date: 2005-08-12 17:38:42 CEST

"Dave Held" <dave.held@arraysg.com> wrote on 08/12/2005 11:31:13 AM:

> Overall, subclipse is a very useful plugin. But I have never gotten
> the Merge command to work in a satisfactory way. Most of the
> time, I experiment with different things and nothing happens. By
> accident, I have gotten one or two merges to work. I am hoping
> that someone can explain to me the proper way to merge within
> subclipse. Here is my last attempt:
> .../branches/dm2 (622) is the source branch I want to merge
> .../trunk (555) is the target I want to merge *to*
> In one trial, I was in the /dm2 branch, and issued a Merge
> command by right-clicking on my project folder in the Package
> Explorer within the Java perspective. I get a dialog, whereby I
> select the /dm2 path as the From path, and select Head
> Revision. I then select the /trunk path as the To path, and
> again select Head. When I click Dry Run, basically nothing
> happens. When I click Merge, the dialog goes away, but there
> are no changes on the /trunk.
> Next experiment: use revision numbers. I do the same as
> above, but instead of using Head, I put in the revision numbers
> explicitly. Same effect (which is to say, none).
> Next experiment: merge from target. I switch to /trunk and
> attempt the merge as before, both ways. No effect. I must be
> missing something obvious, but it completely eludes me. Any
> help would be greatly appreciated.

Our merge dialog is basically the same as the one in TortoiseSVN. They
have some pretty good docs that explain it.

http://tortoisesvn.sourceforge.net/docs/release/TortoiseSVN_en/ch05s17.html

Also, check the Subversion book link they link to.

Mark

_____________________________________________________________________________
Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs.
_____________________________________________________________________________
Received on Sat Aug 13 01:38:42 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.