On Thu, 26 Jan 2006 10:58:31 -0500, Mark Phippard wrote:
>> Does merging work at all in 0.9.105?
>
> I use it every day.
Okay..<shuffles feet>..I guess the joke's on me, then. Thank you for your
patience.
> Why? According to your command line, the from and to URL should both be
> trunk.
.. and this is where I went wrong. Based on the commandline options and from
what I read in the Subversion book I (mis)understood that the paths are
necessary (as in relevant even when working in the same repo), and in my
example would be derived from the working copy as implicit "To:" argument.
> There is actually decent help associated with the dialog, I would
> encourage you to review it.
I did check the online help but only read the general Synchronize page
while missing the one on Merge (with the picture). my bad.
> You have a project in your workspace that is from your branch, correct?
> Select the project and do Team -> Merge
> Enter the URL of trunk in the From URL:
>
> The easiest thing to do, if performance is not an issue, is to press Show
> Log on the revision field and then select the contiguous range of
> revisions from trunk that you want to merge to your branch. This will
> fill in the From and To revision fields correctly to merge in the range of
> revisions you selected. You can of course just type the values.
>
> Then press OK.
That worked fine and exactly as expected, even with JavaSVN. ;)
I now actually understand how this works, and why. I suppose many
misunderstandings on the whole merging topic are IMHO caused by the often
very confusing descriptions in both the Subversion book and also Subclipse
docs. I'm not a native english speaker (German) but despite being a
programmer myself do know a bit about technical writing; especially the
Merge page could need some improvements. I will post some suggestions to
the dev list.
Thanks again,
Holger
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Fri Jan 27 12:51:59 2006