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

TortoiseMerge behaviour + an error

From: <mika.karkkainen_at_tietolaite.com>
Date: Wed, 09 Jan 2008 17:38:37 +0200


I've got two issues here;

#1 TortoiseMerge runs with the /merged: switch pointing to a temporary file,
under the .svn directory.

#2 TortoiseMerge fails with error "Repository moved permanently to ..."

Some basics ...

- In the repository, a branch has been kicked off the trunk,
- in the branch, three revisions (4,5,6) have been created
- the trunk is at revision 8
- I merged the revision 4 to trunk => which resulted in rev 7
- I committed a property change to trunk => which resulted in rev 8

Now, I'm trying to merge the rev 6 (only) from branch into the trunk, but it
seems to be overly difficult.

The steps I do:

1 check out a fresh working copy off the trunk
2 in explorer, right-click on the trunk WC's top folder and select
TortoiseSVN/Merge ...
3 Select "Merge a range of revisions"
4 Enter the branch address in the "URL to merge from"
5 Enter 6 in "Revision range to merge"
6 Use the defaults in the "Merge options" dialog
7 Click Merge
8 In the Resolve Conflict dialog, click "Edit conflict"
9 TortoiseMerge comes up in three-way merge mode, the Merged -pane's title
implies that the result file, if saved, will go under the .svn area <=> does this
make any sense from the user's point of view?
(The full /merged-arg is: /merged:"C:\WC\deltaT\.svn\tmp\tempfile.45.tmp"
I'd expect the path to be: "C:\WC\deltaT\deltaT.cpp"

Now, if I:
10 resolve the conflicts (picking only the rev 6 stuff)
11 save the Merged file and exit TortoiseMerge
12 Click Resolved =>

The only thing that changes in the actual target .cpp file, is the time stamp and
the Merged file happily remains under .svn ..

The error message of #2 occurs, if I, in step 2 above, select the target file
instead of the WC's root folder and try to merge the file.

Being a true newbie to TSVN, maybe I'm heavily misusing the Merge facility here.

The TortoiseSVN version used on a Win2K SP4 box is;
TortoiseSVN 1.4.99, Build 11836 - 32 Bit -dev, 2008/01/08 23:41:27
Subversion 1.5.0, -dev
apr 1.2.11
apr-utils 1.2.10
berkeley db 4.4.20
neon 0.27.2
OpenSSL 0.9.8g 19 Oct 2007
zlib 1.2.3

On the ubuntu server-side is;
svn, version 1.4.3 (r23084)
   compiled Mar 28 2007, 22:48:32
apache 2.0

To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-01-09 16:41:54 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.