Nabble - tortoisesvn - users

Re: TSVNCache.exe cause explorer hanging

2009-12-21T13:06:17Z

Peter Willis wrote:
> I am using version 1.6.1 and have the same problem.

Get a newer version! In particular, a nightly build since 1.6.6.

>...
> Is there any way to disable the use of TSVNCache.exe?

Sure - just look at the Settings dialog, Icon Overlays page, "Status
cache" setting... hint: try "None".

Robert Roessler

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2432084

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].

Re: Bug: Apostrophe (single quote) in filename kills Tortoise

2009-12-21T13:05:33Z

On 21.12.2009 20:18, Jon Langevin wrote:
> When using TortoiseSVN, if you run SVN Update, and one of the files
> being pulled down has an apostrophe/single quote in the name, it breaks
> TortoiseSVN (v1.6.6.17493), as it says the file doesn't exist, and won't
> proceed further.

Can not reproduce that.
Are you sure the reason is the apostrophe? Maybe it looks like an
apostrophe but is actually another char?
Remember that some chars are illegal for filenames on Windows.

Also what is the *exact* error message you get?

Stefan

--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2432083

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].

Bug: Apostrophe (single quote) in filename kills Tortoise

2009-12-21T11:18:33Z

When using TortoiseSVN, if you run SVN Update, and one of the files being pulled down has an apostrophe/single quote in the name, it breaks TortoiseSVN (v1.6.6.17493), as it says the file doesn't exist, and won't proceed further.

--
Jon L.

Re: Feature Request: Option to Lock on Checkout

2009-12-21T10:27:51Z

On Mon, Dec 21, 2009 at 12:07, Peter Willis <pwillis@...> wrote:
> It would be nice to have a user selectable option to LOCK files immediately on check-out.
>
> Now, I understand this may appear counter to the subversion philosophy of NOT locking files,
> however, in the case of binary files that are not source code this is the best option.

No, it is only the "best" option if you intend to modify that one file
& commit it in relatively short order. Otherwise, one user can
effectively hold an entire repository hostage by using this option and
then never unlocking those files.

> Perhaps just add a context menu item 'Checkout with Locks...' that users can use in the context menu as an alternative to 'Checkout...'
> That way users can select the option in general the settings tab of the preferences dialog.

You'll be left with a lot of people selecting that option, then
deleting their WC or otherwise not releasing the lock, and people will
be stealing locks left and right - an even worse scenario. You do not
want to encourage people to steal locks - you may as well not have
locking at all in the case, because they'll just ignore it.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2432060

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].

Re: Feature Request: Show locked file icons after checkout

2009-12-21T10:24:48Z

On Mon, Dec 21, 2009 at 12:11, Peter Willis <pwillis@...> wrote:
> It would be good if, after checking out files,
> the 'lock' icon showed which files are locked by other users.
>
> Version 1.6.1 icons show no indication of locks
> until I request a lock. Icons also don't refresh to indicate that files are locked by other users even after requesting a lock.

Subversion working copies (this is in the SVN libraries, not just
TSVN) do not track the state of locks other than those which were
acquired from that working copy. Locks may be very transient and there
isn't a good reason to cache that information - it may become invalid
very quickly, and you have to contact the repository anyway to acquire
a lock - you'll find out if someone has the file locked when you
attempt to do so.

If you must have this information available all the time, keep a Check
for Modifications window open all the time and periodically refresh by
clicking "Check repository".

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2432059

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].

Re: Feature Request: Option to Lock on Checkout

2009-12-21T09:38:50Z

On Mon, Dec 21, 2009 at 10:07 AM, Peter Willis <pwillis@...> wrote:

It would be nice to have a user selectable option to LOCK files immediately on check-out.

Now, I understand this may appear counter to the subversion philosophy of NOT locking files,
however, in the case of binary files that are not source code this is the best option.

Perhaps just add a context menu item 'Checkout with Locks...' that users can use in the context menu as an alternative to 'Checkout...'
That way users can select the option in general the settings tab of the preferences dialog.

Please see http://svnbook.red-bean.com/en/1.5/svn.advanced.locking.html

Feature Request: Show locked file icons after checkout

2009-12-21T09:11:57Z

It would be good if, after checking out files,
the 'lock' icon showed which files are locked by other users.

Version 1.6.1 icons show no indication of locks
until I request a lock. Icons also don't refresh to indicate that files are locked by other users even after requesting a lock.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2432044

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].

Feature Request: Option to Lock on Checkout

2009-12-21T09:07:51Z

It would be nice to have a user selectable option to LOCK files immediately on check-out.

Now, I understand this may appear counter to the subversion philosophy of NOT locking files,
however, in the case of binary files that are not source code this is the best option.

Perhaps just add a context menu item 'Checkout with Locks...' that users can use in the context menu as an alternative to 'Checkout...'
That way users can select the option in general the settings tab of the preferences dialog.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2432042

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].

RE: Re: TSVNCache.exe cause explorer hanging

2009-12-21T08:56:17Z

I am using version 1.6.1 and have the same problem.

TSVNCache.exe begins to hog system resources
and grinds explorer.exe to a stand-still.

If I can I kill the TSVNCache.exe process using the windows task manager and then all is well.

Perhaps there is a memory leak somewhere in
that application...(??)

Is there any way to disable the use of TSVNCache.exe?

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2432039

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].

File list is empty when single item selected

2009-12-21T07:15:04Z

I've noticed a weird issue with TortoiseSVN. There're several
dialogues that are supposed to display a file list so you can fine
tune what items it applies to: commit, check for modifications,
revert...

What happens to me is that the file list is empty when I right click
on a single file. There's nothing to choose from and there's a "File
list is empty" message. However, if I select the file I need plus any
other item I get both items in the file list. I can then uncheck the
other file and proceed as usual.

Is it a known issue?

I'm using TortoiseSVN 1.6.6 under Windows XP Professional XP3 against
a repository under Subversion 1.6.5 via HTTPS.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2432009

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].

TortoiseSVN translation status report for r18081

2009-12-21T03:13:39Z

Hi Folks,

here's your weekly translation status report

Tortoise gui translation ==================================================
: Developer Version : Current Release
Location : trunk : branches/1.6.x
Total strings : 2147 : 2087
Language : Status (un/fu/ma) : Status (un/fu/ma)
===========================================================================
Bulgarian (bg) : 95% (103/0/0) : OK
Catalan (ca_ES) : 95% (94/0/0) : OK
Chinese, simplified (zh_CN) : 97% (64/0/0) : OK
Chinese, traditional (zh_TW) : 95% (93/0/1) : OK
Croatian (hr) : 95% (93/0/0) : OK
Czech (cs) : 95% (93/1/0) : OK
Danish (da) : 95% (103/0/0) : OK
Dutch (nl) : 99% (2/0/0) : OK
Finnish (fi) : 99% (8/0/0) : OK
French (fr) : 96% (65/0/0) : OK
Georgian (ka) : 95% (93/0/0) : OK
German (de) : OK : OK
Greek (el) : 61% (685/141/25) : 63% (591/162/23)
Hungarian (hu) : 96% (65/0/0) : OK
Indonesian (id) : 95% (93/0/0) : OK
Italian (it) : 95% (103/0/0) : OK
Japanese (ja) : 96% (83/0/0) : OK
Korean (ko) : 96% (85/0/0) : OK
Macedonian (mk) : 95% (103/0/0) : OK
Norwegian, bokmål (nb) : 99% (2/0/0) : OK
Persian (fa) : 97% (64/0/0) : OK
Polish (pl) : 99% (8/0/0) : OK
Portuguese, Brazil (pt_BR) : 97% (64/0/3) : OK
Portuguese, Portugal (pt_PT) : 95% (93/0/0) : OK
Romanian (ro) : 99% (0/0/1) : OK
Russian (ru) : 95% (93/0/0) : OK
Serbian cyrillic (sr_spc) : 99% (2/0/0) : OK
Serbian latin (sr_spl) : 99% (2/0/0) : OK
Slovak (sk) : 95% (100/0/0) : OK
Slovenian (sl) : 95% (93/0/2) : OK
Spanish (es) : 94% (127/0/0) : OK
Swedish (sv) : 99% (2/0/0) : OK
Turkish (tr) : 97% (64/0/0) : OK
Ukrainian (uk) : 99% (2/0/0) : OK

TortoiseSVN doc translation ===============================================
: Developer Version : Current Release
Location : trunk : branches/1.6.x
Total strings : 2752 : 2707
Language : Status (un/fu/ma) : Status (un/fu/ma)
===========================================================================
Chinese, simplified (zh_CN) : 78% (306/286) : 79% (279/272)
Dutch (nl) : 52% (1317/0) : 52% (1286/3)
Finnish (fi) : OK : OK
French (fr) : 86% (227/136) : 87% (211/134)
German (de) : OK : OK
Indonesian (id) : 53% (664/608) : 54% (628/597)
Japanese (ja) : 98% (33/0) : OK
Persian (fa) : 2% (2694/1) : 2% (2649/1)
Portuguese, Brazil (pt_BR) : 29% (1912/17) : 29% (1882/14)
Portuguese, Portugal (pt_PT) : 6% (2560/0) : NONE
Russian (ru) : 99% (1/0) : OK
Serbian cyrillic (sr_spc) : OK : OK
Serbian latin (sr_spl) : OK : OK
Slovak (sk) : 29% (1807/143) : 27% (1790/162)
Slovenian (sl) : 83% (463/0) : 85% (402/0)
Spanish (es) : 96% (59/44) : 97% (29/27)

TortoiseMerge doc translation =============================================
: Developer Version : Current Release
Location : trunk : branches/1.6.x
Total strings : 313 : 312
Language : Status (un/fu/ma) : Status (un/fu/ma)
===========================================================================
Chinese, simplified (zh_CN) : OK : OK
Croatian (hr) : 66% (104/0) : 66% (103/0)
Dutch (nl) : OK : OK
Finnish (fi) : OK : OK
French (fr) : OK : OK
German (de) : OK : OK
Indonesian (id) : 99% (2/1) : 99% (2/1)
Japanese (ja) : 99% (1/0) : OK
Portuguese, Brazil (pt_BR) : OK : OK
Portuguese, Portugal (pt_PT) : 61% (119/0) : NONE
Russian (ru) : OK : OK
Serbian cyrillic (sr_spc) : OK : OK
Serbian latin (sr_spl) : OK : OK
Slovak (sk) : OK : OK
Slovenian (sl) : OK : OK
Spanish (es) : OK : OK
===========================================================================
Status: fu=fuzzy - un=untranslated - ma=missing accelerator keys
===========================================================================

Cheers
- Lübbe

--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net PGP Key ID 0x23F511AB

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2431947

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].

version 1.6.6 commits empty changes / revisions into subversion.

2009-12-20T16:59:29Z

If your in the repo browser and right click on a folder and click \"show
properties\" on a folder which has svn properties
then double click on a property. eg svn:externals
If you dont change anything and click on \'OK\' tortoise asks for a comment.
if you click ok. it will commit a empty change.

Lot\'s of people in my team do this as it was a quick way to view the
externals.
but because of this bug lots of dev\'s are commiting empty changes without
even knowing about it.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2431853

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].

Re: Re: an error occured please help

2009-12-20T16:40:32Z

2009/12/20 Pawel Debski <pdebski@...>:

> Folks,
>
> I just had a similar problem and found a solution that I post here not to let my fellows get into the same trap.
>
> For some reason my C: drive got dirty and I needed to run chkdsk c: /f
>
> That was possible only after booting from Windows Vista Installation CD to get into the recovery environment.
>
> After running chkdsk several times until it found no errors the installation went OK.
>
> I suspect that MS Installer creates a recovery point during the installation process and dirty disk prevents it from doing that (no manual recovery point was possible either).
>
> Would it be possible to make the error message more meaningful than 0x800736B3?

You would have to ask Microsoft to improve their error messages as it
is generated by the Windows installer, not TSVN.

Simon

--
: ___
: oo // \\ "De Chelonian Mobile"
: (_,\/ \_/ \ TortoiseSVN
: \ \_/_\_/> The coolest Interface to (Sub)Version Control
: /_/ \_\ http://tortoisesvn.net

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2431851

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].

RE: Re: an error occured please help

2009-12-20T15:27:51Z

Folks,

I just had a similar problem and found a solution that I post here not to let my fellows get into the same trap.

For some reason my C: drive got dirty and I needed to run chkdsk c: /f

That was possible only after booting from Windows Vista Installation CD to get into the recovery environment.

After running chkdsk several times until it found no errors the installation went OK.

I suspect that MS Installer creates a recovery point during the installation process and dirty disk prevents it from doing that (no manual recovery point was possible either).

Would it be possible to make the error message more meaningful than 0x800736B3?

Best regards
Paul

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2431847

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].

Re: Crash @TortoiseSVN.dll!0000000002de72d9() - TortoiseSVN 1.6.6 x64 on WinXP x64

2009-12-20T04:39:26Z

On 17 Dez., 19:26, Stefan Küng <tortoise...@...> wrote:

Fired up the debugger (VS2008) and these are the interesting bits of
the stack:

...
msvcr90.dll!_invalid_parameter_noinfo() Line 126 C++
TortoiseSVN.dll!std::_Tree<std::_Tset_traits<CShellExt *
__ptr64,std::less<CShellExt * __ptr64>,std::allocator<CShellExt *
__ptr64>,0> >::const_iterator::_Inc() Line 391 + 0x6 bytes C++
TortoiseSVN.dll!std::_Tree<std::_Tset_traits<char const *
__ptr64,StringPool::LessString,std::allocator<char const * __ptr64>,0>
>::erase(std::_Tree<std::_Tset_traits<char const
*,StringPool::LessString,std::allocator<char const *>,0>
>::const_iterator _First=0xeb67a24c391eb481 <Bad Ptr>,
std::_Tree<std::_Tset_traits<char const
*,StringPool::LessString,std::allocator<char const *>,0>
>::const_iterator _Last=...) Line 943 + 0x3b bytes C++
TortoiseSVN.dll!std::_Tree<std::_Tset_traits<CShellExt *
__ptr64,std::less<CShellExt * __ptr64>,std::allocator<CShellExt *
__ptr64>,0> >::erase(CShellExt * const & _Keyval=0x000000000303ec60)
Line 954 C++
TortoiseSVN.dll!CShellExt::~CShellExt() Line 82 C++
TortoiseSVN.dll!CShellExt::`scalar deleting destructor'() + 0x17
bytes C++
> TortoiseSVN.dll!CShellExt::Release() Line 290 + 0x31 bytes C++
shell32.dll!CFSFolder::_LoadColumnHandlers() - 0x38d bytes
...

The code in question is:
TortoiseShell/ShellExt.cpp:80: g_exts.erase(this);
I *think* the crash is due to lack of protection against parallel
modification by different threads. Basically multiple erase() are
executed in parallel and the first erase modifies the list while the
others still run and then operate on outdated data.
The whole g_exts stuff is actually a no-op and can be omitted it
seems.
If not and tracking the instances in g_exsts is indeed required for
some reason then put in some critical section or mutex and be done.

I guess this does not surface in 32bit builds because, IIRC, the 32bit
explorer will not use multiple threads for shell extensions, while the
64bit actually does (at least on XP x64) among other differences.

Another problem, but likely unrelated:
Looking at AddRef/Release shows that the ref counters are modified in
a non-atomic way. Better use InterlockedIncrement/
InterlockedDecrement.

Cheers
Nils

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2431794

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].

Re: Newbie user startup problems with TortoiseSVN 1.6.6

2009-12-19T11:16:46Z

Simon Large wrote:
> [ *SNIP* ]
>
> If you think the original instructions are not clear, please let us
> know how they could be improved, or at least which part is
> unclear/ambiguous.
>
> Simon
>

The basic problem is my background and intended use just does not
match your target audience. My formal training ended back when
"core memory" was visible to naked eye and a VERY high speed
modem was 1200 BAUD ;) My intended use is for a single user on a
single machine.

I've made several attempts to write up a description of how I
tripped up myself. None of them would be very informative to
someone who didn't already know me.

If the HTML version of the docs available at
http://tortoisesvn.net/support were available as a single file, I
think I could prune and rearrange to target a user such as myself.

The result *would _NOT_ * be a standalone manual.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2431741

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].

post-commit-hook exit-code value ignored when creating tag/tag - bug

2009-12-19T03:02:17Z

Hi All,

I setup a simple post-commit-hook that will simply write something to the stderr and return 1.

when testing this hook using simple commit - it worked propely and both exit code and error meaage appeared at the TortoiseSVN console.

when testing this hook using the branch/tag command - got nothing... the TotruiseSVN consolee ignored both exit code and error message and exited successfuly.

to double check this, I tried the "svn copy" commnd, this behaved properly and printed the error message to my console.

Re: Windows 7, Can't check out project

2009-12-18T16:53:46Z

I have the same problem, but if I use https instead of http is works.

On Dec 7, 8:53 pm, Osama Askari <programmer.ask...@...> wrote:
> I have the same problem. I can't even checkout 1 MB repositories. I've installed thewindowsupdate mentioned here but the problem still remains. I'm usingWindows7Ultimate x64 and TortoiseSVN 1.6.6.17493-x64.
>
> ------------------------------------------------------http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMess...
>
> To unsubscribe from this discussion, e-mail: [users-unsubscr...@...].

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2431648

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].

Re: Bug in Merge

2009-12-18T11:32:11Z

Hello!

I was going to argue in favour of the TortoiseSVN, but then I did my
own investigation, and I hope that serves the community.

sgn> 4.20.7:"Either way, no attempt is made to merge the changes - you
sgn> choose one or the other." So I it have to take the file how is
sgn> listed in theirs in the diff window I show.

Looks like that either that bit is unclear in the documentation, or
we do have a misimplementation. What happens in your case is:
the file gets merged, and all the conflicted parts are taken from
the "theirs" (repository) version, while you are expecting (and
documentation suggests) that the entire "theirs" file would be
taken, and not just the conflicted parts.

Here I put together a little batch file to reproduce the problem
(command-line SVN client is required to run):

--8<---
:: BSPath = path to the current folder with backslashes
:: FSPath = path to the current folder with forward slashes
set BSPath=%~dp0
set FSPath=%BSPath:\=/%

:: create repository "repo" with initial content
svnadmin create %BSPath%repo
md wc
cd wc
md trunk
md branches
cd trunk
echo 1 >>file.txt
echo 2 >>file.txt
echo 3 >>file.txt
echo 4 >>file.txt
cd ..\..
svn import wc file:///%FSPath%repo -m "Initial import."
rd /s /q wc

:: create the conflict between "branches/test" and "trunk"
svn copy file:///%FSPath%repo/trunk file:///%FSPath%repo/branches/test -m "Created the test branch."
svn checkout file:///%FSPath%repo wc
cd wc\trunk
del file.txt
echo 1 trunk>>file.txt
echo 2 trunk>>file.txt
echo 3 trunk>>file.txt
echo 4 >>file.txt
echo 5 This line was only added in trunk.>>file.txt
cd ..\branches\test
del file.txt
echo 1 branches\test>>file.txt
echo 2 branches\test>>file.txt
echo 3 branches\test>>file.txt
echo 4 >>file.txt
::echo 5 This line was only added in branches\test.>>file.txt
cd ..\..
svn commit -m "Created the conflict."
::svn merge -c 3 file:///%FSPath%repo/branches/test trunk
cd ..
--8<---

Save it in an empty folder and run.
Now you'll have to manually merge rev3 from branches/test to trunk.
Go to "wc" folder, right-click on trunk, select TortoiseSVN -
Merge... - Next, fill the path to file:///.../repo/branches/test,
set revision to merge = 3, Next, Next, Use repository. The conflict
you'll get is shown on the attached Conflict.png. Now if you look
into trunk/file.txt you'll see the last line: "5 This line was only
added in trunk.", which reproduces the bug OP is seeing. That last
line was never added to the branches/test/file.txt, it was only
added in trunk, and the OP expects it to be gone when he choses the
"Use repository" (=branches/test) option.

To get the expected behaviour he currently should choose "Edit
conflict" to open TortoiseMerge, then right-click on the left
"Theirs" pane and select the "Use this whole file" item.

Now if you uncomment the "svn merge" command at the bottom of the
batch file and select "(s) show all options" when prompted by the
command-line client, you'll see the following menu:

--8<---
Select: (p) postpone, (df) diff-full, (e) edit, (r) resolved,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: s

(e) edit - change merged file in an editor
(df) diff-full - show all changes made to merged file
(r) resolved - accept merged version of file

(dc) display-conflict - show all conflicts (ignoring merged version)
(mc) mine-conflict - accept my version for all conflicts (same)
(tc) theirs-conflict - accept their version for all conflicts (same)

(mf) mine-full - accept my version of entire file (even non-conflicts)
(tf) theirs-full - accept their version of entire file (same)

(p) postpone - mark the conflict to be resolved later
(l) launch - launch external tool to resolve conflict
(s) show all - show this list
--8<---

Apparently, when you click "Use repository" TortoiseSVN performs the
"(tc) theirs-conflict" command, while the OP expects it to do the
"(tf) theirs-full". The documentation kind of supports the OP's
expectations by saying that no merging will be performed whatsoever
and that you choose either local file or remote file (it reads as if
it means the entire file, not selected pieces of it). TortoiseSVN
does not currently provide buttons to select the "mine-full" or
"theirs-full" commands, except in the context menu of the
TortoiseMerge (which is kind of hidden, if you ask me).

So, I think it's either a bug (wrong commands executed by the
buttons), or a lacking feature (needs two more buttons for the
missing mf & tf commands), and the documentation may need
correction.

PS: It is always hard to create a short and expressive labels for
the buttons. If I may make a suggestion, "mf" can be labeled
"Discard repository changes", and "tf" can be "Discard local
changes". A mouseover hint could further clarify the actions to be
performed.

---=====---
Alexander

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2431574

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].

Conflict.PNG (45K) Download Attachment

Re: Bug in Merge

2009-12-18T11:18:59Z

My earlier post regarding this issue:

http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2396212

Jonathan Paton

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2431567

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].

Issue tracker plugin suggestion

2009-12-18T06:40:54Z

Hi guys.
I see some things about issue tracker as track, readmine, gurtle...
Based on your expirience, what is the best (free) issue tracker?

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2431496

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].

Re: Upgrade failed

2009-12-18T01:13:06Z

2009/12/18 Andy Levy <andy.levy@...>:

> On Thu, Dec 17, 2009 at 18:20, Gordon Markham
> <gordon.markham@...> wrote:
>> Environment is Windows XP
>>
>> I had been using version 1.5.7.1582 for some time. I tired to upgrade to
>> 1.6.6. It installed without a message. When I tried to use it I get
>>
>> Unable to open an ra_local session to URL
>> Unable to open repository 'file:///F:/SvnData/Projects'
>> Failed to load module for FR type bdb
>>
>> I uninstalled and reverted to 1.5.7.1582, which now gives the same message.
>>
>> Where can I get the module that did not load?
>>
>> Command-line operation of SVN works OK
>
> I think (may be wrong) that 1.6 did away with support for BDB. A few questions:

Correct. The TSVN 1.6 client no longer supports BDB for file://
access. It does of course support all the other protocols, so if a
subversion server is using BDB that is fine.

> 1) Is F a network drive? If so, you should be using a proper server
> (svnserve or Apache), not file:/// . file:/// is meant only for
> single-user local access.
> 2) What version of Subversion was the repository created with?
> 3) Why are you using BDB? FSFS has been the default since 1.2 and in
> most situations, more desireable.
>
> You can convert the repository to FSFS by dumping it to a file
> (svnadmin dump), then loading it (svnadmin load) into a
> freshly-created repository

Simon

--
: ___
: oo // \\ "De Chelonian Mobile"
: (_,\/ \_/ \ TortoiseSVN
: \ \_/_\_/> The coolest Interface to (Sub)Version Control
: /_/ \_\ http://tortoisesvn.net

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2431427

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].

Bug in Merge

2009-12-17T23:51:26Z

Hello Alexander,

thank you for your answer. I think my question was not clear enough.

sgn> That is correct behaviour. You have to commit your working copy to
sgn> fixate the merged changes.

That is ok and I understand that I have to do a commit after a merge. For a better description of my Problem I add three pictures. One shows the diff befor I do a merge. There can you see mine, theirs and the merge. Mine is the working copy, theirs is the repository that I want to merge in my working copy. And merge is the merged file of both.

So when I do a merge and the conflict window expire I press "Use repository" so you can see in the another picture. It is descript in the manual quote of chapter 4.20.7:"Either way, no attempt is made to merge the changes - you choose one or the other." So I it have to take the file how is listed in theirs in the diff window I show.

But what it do is to take the merged file how you can see in my last picture. I hope you understand my problem and recognize the bug. I believe the behaviour of the button "Use repository" is false programed.
Thanks
--
GRATIS für alle GMX-Mitglieder: Die maxdome Movie-FLAT!
Jetzt freischalten unter http://portal.gmx.net/de/go/maxdome01

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2431395

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].

diff.JPG (387K) Download Attachment
conflict_window.JPG (38K) Download Attachment
use_repository.JPG (43K) Download Attachment

Re: Diff and Diff Previous doesn't work

2009-12-17T22:36:44Z

Hi,

2009/12/18 senf <tellingmachine@...>:
> If I try to Diff two files then I get colored areas, but I don't see
> any text other than to strange looking characters in the top left
> corner.
>
> Is this a bug or did I screw up some of my settings.
> In my case I am comparing a *.ps1 (powershell) file.
>

TSVN can only show diffs for text files natively. All other formats
require an external tool to show you the diffs. From your description,
it looks like powershell files are non-text files that accidentally
get interpreted as text files.

Set the svn mime type property for these files to a non-text mime type
and configure an external diff viewer for powershell files (if that is
available) through the TSVN->Settings->External Programs dialog.

--
Regards,

Jean-Marc
--
. ___
. @@ // \\ "De Chelonian Mobile"
. (_,\/ \_/ \ TortoiseSVN
. \ \_/_\_/> The coolest Interface to (Sub)Version Control
. /_/ \_\ http://tortoisesvn.net

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2431380

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].

Non-Recursive Directory Delete

2009-12-17T20:33:12Z

Hi,

I've got the following working copy with the a status (reported via 'svn status') as follows:

M      c
A       c\kappa.doc
D       c\d
D       c\d\gamma.txt
D       c\d\alpha.txt
D       c\d\beta.txt
A       c\mu.doc

NOTE: 'c' has a property modification to 'svn:ignore'

Through TSVN, I can successfully commit the entire set of changes for 'c' and its children. Similarly, I can also commit just the delete of 'c\d' and the property change to 'c' separately.

However, if I elect to commit both the property change to 'c', and the deletion of 'd' (excluding the c\kappa.doc and c\mu.doc files), then TSVN gives me the following error:

-----------------------
Cannot non-recursively commit a directory deletion of a directory with child nodes
To commit recursively and work around this error,
make sure that all child items of a checked folder
are also checked in the commit dialog.
Otherwise, TortoiseSVN must do a non-recursive commit
which does not allow directory deletion.
-----------------------

I can successfully commit this combination of files using the SVN command-line client. Using the new 'commit labels' in the nightly builds,

I'm using the 1.6.99 (build 18021) nightly build, but we originally found the issue under TSVN 1.6.5.

---
Daniel Becroft

Re: Upgrade failed

2009-12-17T17:43:13Z

On Thu, Dec 17, 2009 at 18:20, Gordon Markham
<gordon.markham@...> wrote:

> Environment is Windows XP
>
>
>
> I had been using version 1.5.7.1582 for some time. I tired to upgrade to
> 1.6.6. It installed without a message. When I tried to use it I get
>
>
>
> Unable to open an ra_local session to URL
>
> Unable to open repository 'file:///F:/SvnData/Projects'
>
> Failed to load module for FR type bdb
>
>
>
> I uninstalled and reverted to 1.5.7.1582, which now gives the same message.
>
>
>
> Where can I get the module that did not load?
>
>
>
> Command-line operation of SVN works OK

I think (may be wrong) that 1.6 did away with support for BDB. A few questions:

1) Is F a network drive? If so, you should be using a proper server
(svnserve or Apache), not file:/// . file:/// is meant only for
single-user local access.
2) What version of Subversion was the repository created with?
3) Why are you using BDB? FSFS has been the default since 1.2 and in
most situations, more desireable.

You can convert the repository to FSFS by dumping it to a file
(svnadmin dump), then loading it (svnadmin load) into a
freshly-created repository

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2431354

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].

Diff and Diff Previous doesn't work

2009-12-17T16:48:12Z

If I try to Diff two files then I get colored areas, but I don't see
any text other than to strange looking characters in the top left
corner.

Is this a bug or did I screw up some of my settings.
In my case I am comparing a *.ps1 (powershell) file.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2431350

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].

Upgrade failed

2009-12-17T15:20:04Z

Environment is Windows XP

I had been using version 1.5.7.1582 for some time. I tired to upgrade to 1.6.6. It installed without a message. When I tried to use it I get

Unable to open an ra_local session to URL

Unable to open repository 'file:///F:/SvnData/Projects'

Failed to load module for FR type bdb

I uninstalled and reverted to 1.5.7.1582, which now gives the same message.

Where can I get the module that did not load?

Command-line operation of SVN works OK

Thanks.

Gordon W. Markham

Re: Crash @TortoiseSVN.dll!0000000002de72d9() - TortoiseSVN 1.6.6 x64 on WinXP x64

2009-12-17T12:24:34Z

ok will do so Stefan

On Dec 17, 11:26 pm, Stefan Küng <tortoise...@...> wrote:

> On 17.12.2009 16:52, suneel wrote:
>
> > Hi
> > I too am facing the same issue as you are. My computer is
> > winXp64 bit and has all the patches. The frequency of the crash has
> > become more and more frequent, like atleast 12 per day. When i am
> > working and simply switch the explorer and click on the right side
> > pane of the explorer, it crashes.
>
> Then please, download the debug symbols from here:http://sourceforge.net/projects/tortoisesvn/files/
> (the file with the "pdb" in its name, compressed with 7-zip).
>
> copy/move the debug symbol files to c:\program files\tortoisesvn\bin and
> wait for the crash. Then start a debugger and send me the stack trace.
>
> Stefan
>
> --
> ___
> oo // \\ "De Chelonian Mobile"
> (_,\/ \_/ \ TortoiseSVN
> \ \_/_\_/> The coolest Interface to (Sub)Version Control
> /_/ \_\ http://tortoisesvn.net
>
> ------------------------------------------------------http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMess...
>
> To unsubscribe from this discussion, e-mail: [users-unsubscr...@...].

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2431302

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].

Re: Missing one year of Log Messages, but they show with SVN Log

2009-12-17T11:53:10Z

On 16.12.2009 23:22, Greywolf wrote:

> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> [Thus spake Stefan Küng ("SK: ") 7:32pm...]
>
>
> SK:> Seems it was a stale log cache, after deleting the caches then it now
> SK:> works. Would be nice it was updated when doing SHIFT + refresh.
> SK:
> SK: Why shift-refresh? Ctrl-refresh works.
>
> I think the point is that it would be nice if<otherkey>-refresh would
> actually update the cache rather than simply bypassing it (I can't think
> of a time where if you bypass the cache you wouldn't also want it
> updated).
>
> Are you saying that Ctrl-Refresh updates the cache? Perhaps something in
> a tooltip to this effect would be helpful...

Actually, both shift-refresh and ctrl-refresh both update the cache.

Stefan

--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2431292

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].

Re: Crash @TortoiseSVN.dll!0000000002de72d9() - TortoiseSVN 1.6.6 x64 on WinXP x64

2009-12-17T10:26:28Z

On 17.12.2009 16:52, suneel wrote:
> Hi
> I too am facing the same issue as you are. My computer is
> winXp64 bit and has all the patches. The frequency of the crash has
> become more and more frequent, like atleast 12 per day. When i am
> working and simply switch the explorer and click on the right side
> pane of the explorer, it crashes.

Then please, download the debug symbols from here:
http://sourceforge.net/projects/tortoisesvn/files/
(the file with the "pdb" in its name, compressed with 7-zip).

copy/move the debug symbol files to c:\program files\tortoisesvn\bin and
wait for the crash. Then start a debugger and send me the stack trace.

Stefan

--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2431266

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].

RE: what's the best practice to revert merge some of files?

2009-12-17T08:47:15Z

> 2009/12/17 Bob Archer <bob.archer@...>:
> >> Like my work copy directory are math, util.
> >> In math directory I commit 10 files to add a feature, and now
> r100,
> >> then I found in the commit 3 files were
> >> totally wrong, I should revert changes of these 3 files, What's
> the
> >> best practice?
> >
> > Well, you can't really do a reverse merge since that will reverse
> everything.
> >
> > (quick terminology note, "revert" in svn speak means removing
> changes that are in your local working copy.)
> >
> > Two options...
> >
> > 1. Do a reverse merge and then revert all the files except the 3
> in question and the commit.
> >
> > 2. Do an Update to revision 99. (the revisions before your
> commit). Copy the 3 files to a temp folder. Update your working
> copy. Put the 3 files from rev99 back into your working copy. Then
> commit.
>
> Show log for the folder and select r100. The bottom pane shows all
> files changed in that revision.
> Right click on any file and select "Revert changes from this
> revision".
> Do the same for the other files.
> Do any more editing to make it all work.
> Commit.
>
> Simon

Cool. Thanks Simon... I didn't know you could do that. !

BOb

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2431248

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].

Re: Bug in Merge

2009-12-17T07:55:47Z

Hello!

sgn> But what it do is to merge it with my working copy! This behavior
sgn> is repeatable.

That is correct behaviour. You have to commit your working copy to
fixate the merged changes.

---=====---
Alexander

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2431231

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].

Re: Crash @TortoiseSVN.dll!0000000002de72d9() - TortoiseSVN 1.6.6 x64 on WinXP x64

2009-12-17T07:52:28Z

Hi
I too am facing the same issue as you are. My computer is
winXp64 bit and has all the patches. The frequency of the crash has
become more and more frequent, like atleast 12 per day. When i am
working and simply switch the explorer and click on the right side
pane of the explorer, it crashes.

On Dec 3, 2:09 am, Nils <testnutzer...@...> wrote:

> Some infos:
> TortoiseSVN 1.6.6 x64
> Windows XP x64 fully patched
> Crash @TortoiseSVN.dll!0000000002de72d9()
> TSVN Crashreporter doesn't show (IIRC there is one)
> Various developer environments (PSDK Vista/7, VS2005/2008), but the
> stack doesn't look like any of the dev/debug libs were involved.
>
> TortoiseSVN started to crash explorer.exe quite regularly, almost every day.
> Older versions used to crash too, but just once every few weeks. Maybe
> that was related to something else.
>
> Steps:
> * Open some instances of Windows Explorer
> * Have some external program put/delete files into the opened folders.
> * Wait
> * Crash without doing anything. Actually most of the time the Explorer
> windows are not even visible or even minimized.
>
> While TSVN will "reliably" crash every once-so-often I didn't find a
> reliable way to make it crash, hence the "Wait" step.
>
> Let me know what I can do to help diagnose the problem. (not subscribed
> to the mailing list)
> Cheers
> Nils
>
> IIRC, the stack always looks about the same.
> You'll likely have some pdb around to see where the crash actually happens.
> Here is the complete stack, as produced by VS2005:
>
> msvcr90.dll!__crt_debugger_hook(int _Reserved=) Line 65
> msvcr90.dll!_invoke_watson(const wchar_t *
> pszExpression=0x00000000cb7f0b7a, const wchar_t *
> pszFunction=0x0000000000000401, const wchar_t *
> pszFile=0x0000000000000000, unsigned int nLine=2147500037, unsigned
> __int64 pReserved=0) Line 233
> msvcr90.dll!_invalid_parameter(const wchar_t *
> pszExpression=0x0000000000000000, const wchar_t *
> pszFunction=0x000000000a16df40, const wchar_t *
> pszFile=0x0000000000000001, unsigned int nLine=8, unsigned __int64
> pReserved=0) Line 115
> msvcr90.dll!_invalid_parameter_noinfo() Line 126 > TortoiseSVN.dll!0000000002de72d9()
>
> [Frames below may be incorrect and/or missing, no symbols loaded forTortoiseSVN.dll]
> TortoiseSVN.dll!0000000002de350b()
> TortoiseSVN.dll!0000000002e505c3()
> TortoiseSVN.dll!0000000002e4f116()
> ole32.dll!CreateInprocInstanceHelper() + 0x32 bytes
> ole32.dll!ICoCreateInstanceEx() + 0x1fd bytes
> ole32.dll!CComActivator::DoCreateInstance() + 0x1a0 bytes
> ole32.dll!CoCreateInstance() + 0x7f bytes
> shlwapi.dll!SHCoCreateInstanceAC() + 0x63 bytes
> shell32.dll!_SHCoCreateInstance() - 0x5408 bytes
> shell32.dll!SHExtCoCreateInstance() + 0x5a bytes
> shell32.dll!CFSFolder::_LoadColumnHandlers() - 0x209 bytes
> shell32.dll!CFSFolder::GetDetailsEx() + 0x116 bytes
> shell32.dll!CInfoTip::_GetInfoTipFromItem() + 0x1ad bytes
> shell32.dll!CStatusBarAndInfoTipTask::RunInitRT() + 0xdc bytes
> shell32.dll!CRunnableTask::Run() + 0x42 bytes
> browseui.dll!CShellTaskScheduler_ThreadProc() - 0x2491a bytes
> shlwapi.dll!ExecuteWorkItem() + 0x28 bytes
> ntdll.dll!RtlpWorkerCallout() + 0x10a bytes
> ntdll.dll!RtlpExecuteWorkerRequest() - 0xe1 bytes
> ntdll.dll!RtlpWorkerThread() - 0x598b bytes
> kernel32.dll!BaseThreadStart() + 0x3a bytes
>
> ------------------------------------------------------http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMess...
>
> To unsubscribe from this discussion, e-mail: [users-unsubscr...@...].

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2431230

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].

Re: what's the best practice to revert merge some of files?

2009-12-17T07:52:12Z

2009/12/17 Bob Archer <bob.archer@...>:

>> Like my work copy directory are math, util.
>> In math directory I commit 10 files to add a feature, and now r100,
>> then I found in the commit 3 files were
>> totally wrong, I should revert changes of these 3 files, What's the
>> best practice?
>
> Well, you can't really do a reverse merge since that will reverse everything.
>
> (quick terminology note, "revert" in svn speak means removing changes that are in your local working copy.)
>
> Two options...
>
> 1. Do a reverse merge and then revert all the files except the 3 in question and the commit.
>
> 2. Do an Update to revision 99. (the revisions before your commit). Copy the 3 files to a temp folder. Update your working copy. Put the 3 files from rev99 back into your working copy. Then commit.

Show log for the folder and select r100. The bottom pane shows all
files changed in that revision.
Right click on any file and select "Revert changes from this revision".
Do the same for the other files.
Do any more editing to make it all work.
Commit.

Simon

--
: ___
: oo // \\ "De Chelonian Mobile"
: (_,\/ \_/ \ TortoiseSVN
: \ \_/_\_/> The coolest Interface to (Sub)Version Control
: /_/ \_\ http://tortoisesvn.net

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2431229

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].

Nabble - tortoisesvn - users

Re: TSVNCache.exe cause explorer hanging

Re: Bug: Apostrophe (single quote) in filename kills Tortoise

Bug: Apostrophe (single quote) in filename kills Tortoise

Re: Feature Request: Option to Lock on Checkout

Re: Feature Request: Show locked file icons after checkout

Re: Feature Request: Option to Lock on Checkout

Feature Request: Show locked file icons after checkout

Feature Request: Option to Lock on Checkout

RE: Re: TSVNCache.exe cause explorer hanging

File list is empty when single item selected

TortoiseSVN translation status report for r18081

version 1.6.6 commits empty changes / revisions into subversion.

Re: Re: *an error occured* please help

RE: Re: *an error occured* please help

Re: Crash @TortoiseSVN.dll!0000000002de72d9() - TortoiseSVN 1.6.6 x64 on WinXP x64

Re: Newbie user startup problems with TortoiseSVN 1.6.6

post-commit-hook exit-code value ignored when creating tag/tag - bug

Re: Windows 7, Can't check out project

Re: Bug in Merge

Re: Bug in Merge

Issue tracker plugin suggestion

Re: Upgrade failed

Bug in Merge

Re: Diff and Diff Previous doesn't work

Non-Recursive Directory Delete

Re: Upgrade failed

Diff and Diff Previous doesn't work

Upgrade failed

Re: Crash @TortoiseSVN.dll!0000000002de72d9() - TortoiseSVN 1.6.6 x64 on WinXP x64

Re: Missing one year of Log Messages, but they show with SVN Log

Re: Crash @TortoiseSVN.dll!0000000002de72d9() - TortoiseSVN 1.6.6 x64 on WinXP x64

RE: what's the best practice to revert merge some of files?

Re: Bug in Merge

Re: Crash @TortoiseSVN.dll!0000000002de72d9() - TortoiseSVN 1.6.6 x64 on WinXP x64

Re: what's the best practice to revert merge some of files?

Re: Re: an error occured please help

RE: Re: an error occured please help