The URL i wish to merge from is, e.g.: svn://server/TestRepo/branches/branch1/,
revision 21 (this is the revision immediately after the branch was
created).
The URL i wish to merge to is, e.g.: svn://server/TestRepo/trunk/,
HEAD revision.
Merge options selected (left at default settings):
- Merge depth: working copy,
- Compress whitespaces
The line just before "Finished" says the following:
Command: Merging from svn://server/TestRepo/branches/branch1,
revision 21 to svn://server/TestRepo/trunk, revision HEAD into C:
\Development\TestProject\trunk, respecting ancestry
I hope the above information is sufficient.
In the meantime, i am going to try upgrading Subversion to v1.5.1,
though i dont have much hope.
Thanks for assistance so far.
On Aug 12, 7:44 am, Stefan Küng <tortoise..._at_gmail.com> wrote:
> rwkit wrote:
> > Merge no longer works after I upgraded to the latest version:
>
> > What I mean by that is that no matter what I do, merge just says
> > "Finished!" and does nothing, even though the branches are clearly
> > different.
>
> What's the url and revision you enter?
> What does the progress dialog say in the very first line before
> "Finished" what the command it executes is?
>
> Stefan
>
> --
> ___
> oo // \\ "De Chelonian Mobile"
> (_,\/ \_/ \ TortoiseSVN
> \ \_/_\_/> The coolest Interface to (Sub)Version Control
> /_/ \_\ http://tortoisesvn.net
>
> signature.asc
> < 1KViewDownload
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: dev-help_at_tortoisesvn.tigris.org
Received on 2008-08-12 08:40:24 CEST