[Subclipse-users] Merging in 0.9.105

"The beatings will continue until morale improves." :-)

Does merging work at all in 0.9.105? For my own projects I usually just
worked on trunk and that worked fine, but for another project I now have
to work in my own branch and occasionally re-sync with updates on trunk.
Apologies if I do something boneheaded here but it's driving me nuts that
such a simple task forces me to switch to the commandline or type in
revision numbers when it should be doable with 3-5 clicks on predefined
goals max.

Here's what happens:

- My branch WC is committed.

- I select Team->Merge on the directory with updated files

- From: URL is the project's URL on trunk with HEAD rev

- I select the directory's URL on my branch as To:

- I type in the directory's last committed revision number

- I hit the activated Merge button and despite some churning without
errors, the files in my WC are not updated

- Looking into the directory with the Navigator there's a .tmp file that
seems to contain the new revision of the a file. This happened
"sometimes", I switched between JavaHL and JavaSVN and if I remember
correctly JavaHL at least got me the new rev file whereas JavaSVN only got
me an empty .tmp..maybe the other way around but in any case it was wrong.

Doing the above with the commandline tools "just works":
svn merge -r myrev:HEAD <URL-to-trunk/dir> <WC-root/dirname>
..and bingo.

There are no virus scanners involved, the directory is writable, the file
in question is not opened etc. It also seems to happen with both JavaHL
and JavaSVN, though I'm inclined to primarily blame JavaSVN since doing
the same with SmartSVN works even less: it does not even create a temp
file, let alone a merge.

There are no errors in the logs so any suggestions or ideas are
appreciated.

thanks,
Holger

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Thu Jan 26 16:53:22 2006