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

[TSVN] TortoiseMerge bug when merging?

From: Andrej Ota <andrej.guess.what_at_siol.si>
Date: 2005-06-23 20:52:50 CEST

Hi everybody,

Using TortoiseSVN (module TortoiseMerge) as unprivileged user (only
member of Users group, no other permissions granted) on Windows XP
Professional client exposes something that looks like a bug in the
TortoiseMerge module.

When trying to merge branch in which a new folder was added with
original folder (trunk) creates the folder in trunk, correctly marks it
for adding, but then aborts with error "Can't open 'tmp': Access is
denied.". After error, trunk can be restored to original (HEAD) state
using revert from repository.

At the time of writing no similar bugs were documented issue tracker and
no fixes that might resolve tis issue were noted in Changelog.txt in
TortoiseSVN trunk.

Server environment is:
   - Fedora core 4
   - apache & mod_ssl 2.0.54
   - subversion 1.1.4

Client environment is:
  - Windows XP Professional SP2
  - TortoiseSVN 1.2.0-3602

Steps to reproduce the error are:
-----------------------------------------------------------------------------------
On server:
  - svnadmin create test
  - chown -R apache:apache test

Repository accessible via https://sources.loc/svn/test/

On client:
  - Create directory D:\test
  - Checkout HEAD from https://sources.loc/svn/test to D:\test
    (Completed at revision 0)
  - Create folders D:\test\trunk and D:\test\branches
  - Create text file D:\test\trunk\foo.txt containg text "foo"
  - Commit all changes to repository:
    SVN Commit from context menu of D:\test, check Show unversioned
    files, check both
    folders and file (Completed at revision 1)

  - Context menu on D:\test\trunk: TortoiseSVN -> Branch/Tag
  - Branch HEAD to URL https://sources.loc/svn/test/branches/alternate
    (Completed at revision 2)

  - Context menu on D:\test: SVN Update (Completed at revision 2)
  - Create new folder: D:\test\branches\alternate\dir
  - Create file D:\test\branches\alternate\dir\bar.txt containing text
    "bar"
  - Context menu on D:\test\branches\alternate: SNV Commit, check Show
    unversioned files,
    check both new folder and file (Completed at revision 3)

  - Context menu on D:\test\trunk: TortoiseSNV -> Merge
  - Merge from HEAD https://sources.loc/svn/test/trunk
  - Merge to HEAD https://sources.loc/svn/test/braches/alternate
    (Result will be stored in D:\test\trunk)

Here the client starts to think and the prints out just two lines:
  "Added | D:\test\trunk\dir"
  "Error | Can't open 'tmp': Access is denied."

When observed with FileMon (SysInternals) the three entries of interest are:
TortoiseProc.exe|CREATE |C:\WINDOWS\Media\tmp | ACCESS DENIED
TortoiseProc.exe|OPEN |C:\WINDOWS\Media\tmp | FILE NOT FO...
TortoiseProc.exe|QUERY INFORMATION|C:\WINDOWS\Media\tmp | FILE NOT FO...
-----------------------------------------------------------------------------------

My guess is that the file or folder "tmp" should have been created
either in user %TEMP% folder or somewhere in working copy. Unfortunately
I don't know TortoiseSVN code good enough to give anything more than a
guess.

Oh, and more thing: I'm only sending this to list, without expecting
direct answer. I will watch list archives if there will be any request
for more information or better explanation, but I don't expect and don't
like direct answers. For this reason my return address is invalid and
replies sent directly to me will bounce.

G, Andrej Ota.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Jun 23 20:58:14 2005

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