My url is:
svn://10.0.0.3/opt/code/hosts/firewall/MC_Software/branches/EmbSkewDev
version:
5628
Command:
Merging revisions of svn://10.0.0.3/opt/code/hosts/firewall/MC_Software/branches/EmbSkewDev
into C:\Development\Embedded\JazzRelease, respecting ancestry, Test
Only
I use the default settings of Compare Whitespace.
I am *pretty* sure that the merge was working before the upgrade. If
there is a possibility of a server issue, I'll need something to pass
on to the server guy, something to try or look for, or he's not going
to be much help.
On Aug 12, 2:03 am, John <joh..._at_gmail.com> wrote:
> Actually, this appears to be a problem with the server rather than the
> client.
> I removed the Collabnet installation in favour of VisualSVN Server,
> and merging seems to work perfectly now.
>
> I am unsure as to whether this will also solve rwkit's problem though.
>
> On Aug 12, 8:16 am, John <joh..._at_gmail.com> wrote:
>
>
>
> > 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-unsubscr..._at_tortoisesvn.tigris.org
> > For additional commands, e-mail: dev-h..._at_tortoisesvn.tigris.org
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscr..._at_tortoisesvn.tigris.org
> For additional commands, e-mail: dev-h..._at_tortoisesvn.tigris.org
---------------------------------------------------------------------
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 22:06:19 CEST