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

Re: Possible bug : impossible to merge on a Subversion 1.4 server with TortoiseSVN 1.5

From: Fabio Maulo <fabiomaulo_at_gmail.com>
Date: Fri, 4 Jul 2008 10:23:44 -0700 (PDT)

On 4 jul, 12:12, "Wim Coenen" <wcoe..._at_gmail.com> wrote:
> The issue you are having is with commits failing. Bouiaw's issue is that a
> merge is failing.

Yes but you know that the last operation of a commit is a merge.
I mean the commit work, all change are committed but the last op
(after all send) fail and appear like the entire transaction fail.
What real happen is that the server have all modification and my w/c
remain in the same state before commit (dirty w/c).
After it I make a normal Update, all modification are merged in my w/c
without conflict (each files in server have the same modification of
files in my w/c).

A fastidious situation happen when I have new folders because I must:
1) revert the addition in my w/c
2) delete the folder
3) do update

Note that between my commit and my update nobody else have commit
something.

I don't understand if this is a bug or a breaking change... it is only
a real problem and believe me it not happen before install 1.5

BTW TortoiseSVN is one of the most great soft I have installed in my
PC.

Thanks for your answer.
Fabio Maulo.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-07-04 19:30:34 CEST

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