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

Re: 301 Moved Perm error -- only with TSVN!

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2006-04-20 14:38:03 CEST

On 4/20/06, Eric Horne <subversion@box11.org> wrote:
> > According to our docs:
> > http://tortoisesvn.sourceforge.net/docs/nightly/TortoiseSVN_en/tsvn-cli-main.html#tsvn-cli-merge
> >
> > you should try
> > svn merge --force [--dry-run]
> > http://svn.myserver.com/testrepo/trunk/hello.txt@4
> > http://svn.myserver.com/testrepo/trunk/hello.txt@6
> >
> > And please do that on the same windows box you use TSVN on. Otherwise
> > the test isn't really accurate.
>
> Same box. Failed with TSVN. Drag the mouse over to the command line, run
> the command you supplied. I get the following output:
> ----------------------
> C:\testrepo> svn merge --force ...
> C hello.txt

I think our docs miss something: if the two urls are identical, then
TSVN does a peg merge, which means you should do an
svn merge --force [--ignore-ancestry] -r4:6 url@HEAD workingcopy
also try
svn merge --force [--ignore-ancestry] -r4:6 url@6 workingcopy
svn merge --force [--ignore-ancestry] -r4:6 url@4 workingcopy

I think one of those command will throw the same error as TSVN does.

Stefan

--
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Thu Apr 20 14:38:17 2006

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