You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Joel Wahlberg <Jo...@visma.com> on 2011/01/25 11:15:48 UTC
Assert when Edit Conflict
I've tried to merge some project files but ended up with:
[cid:image002.png@01CBBC80.27E388D0]
Pressing Keep the directory resulted in:
[cid:image001.png@01CBBC80.27E388D0]
[cid:image002.png@01CBBC80.27E388D0]
<Root-project checked in>
<Ciceron-project checked out from trunk>
Merging from a branch with name "xxx" but with a subfolder "Ciceron" to the Root-project directory resulted in this.
Windows XP SP2
TortoiseSVN 1.6.7, Build 18415 - 32 Bit , 2010/01/22 17:55:06
Subversion 1.6.9,
apr 1.3.8
apr-utils 1.3.9
neon 0.29.3
OpenSSL 0.9.8k 25 Mar 2009
zlib 1.2.3
________________________________
Joel Wahlberg
Senior Systems Engineer, Visma Sirius
Switchboard : +46 910 58 66 00 - Direct : +46 910 58 66 36 - Mobile : +46 70 551 94 86
________________________________
RE: Assert when Edit Conflict
Posted by Joel Wahlberg <Jo...@visma.com>.
Thank you for the quick answer. I will upgrade as soon as possible.
/Joel
-----Original Message-----
From: Johan Corveleyn [mailto:jcorvel@gmail.com]
Sent: den 25 januari 2011 11:51
To: Joel Wahlberg
Cc: users@subversion.apache.org
Subject: Re: Assert when Edit Conflict
Hi Joel,
[ In the future, could you please type or copy-paste the error message
in the body of the mail? Makes it easier to read (and not everybody
can open/see inline or attached images), and findable if someone
searches the archives. ]
For posterity, the error message is:
"In file 'D:\Development\SVN\Releases\TortoiseSVN-1.6.7\ext\subversion\subversion\libsvn_wc\tree_conflicts.c'
line 570: assertion failed (strcmp(dir_path,
svn_path_dirname(victim_path, pool)) == 0)"
This looks like issue
http://subversion.tigris.org/issues/show_bug.cgi?id=3469 (tree
conflict at directory external causes assertion to fail).
It was fixed in core SVN 1.6.12 (don't know which version of
TortoiseSVN that is). So if you update to the latest TSVN version, it
will probably be fixed.
Cheers,
Johan
On Tue, Jan 25, 2011 at 11:15 AM, Joel Wahlberg <Jo...@visma.com> wrote:
>
>
>
> I've tried to merge some project files but ended up with:
>
>
>
>
>
> Pressing Keep the directory resulted in:
>
>
>
>
>
>
>
>
>
>
>
> <Root-project checked in>
>
> <Ciceron-project checked out from trunk>
>
>
>
> Merging from a branch with name "xxx" but with a subfolder "Ciceron" to the Root-project directory resulted in this.
>
> Windows XP SP2
>
> TortoiseSVN 1.6.7, Build 18415 - 32 Bit , 2010/01/22 17:55:06
>
> Subversion 1.6.9,
>
> apr 1.3.8
>
> apr-utils 1.3.9
>
> neon 0.29.3
>
> OpenSSL 0.9.8k 25 Mar 2009
>
> zlib 1.2.3
>
>
>
>
>
> ________________________________
>
> Joel Wahlberg
> Senior Systems Engineer, Visma Sirius
>
> Switchboard : +46 910 58 66 00 - Direct : +46 910 58 66 36 - Mobile : +46 70 551 94 86
>
> ________________________________
>
>
Re: Assert when Edit Conflict
Posted by Johan Corveleyn <jc...@gmail.com>.
Hi Joel,
[ In the future, could you please type or copy-paste the error message
in the body of the mail? Makes it easier to read (and not everybody
can open/see inline or attached images), and findable if someone
searches the archives. ]
For posterity, the error message is:
"In file 'D:\Development\SVN\Releases\TortoiseSVN-1.6.7\ext\subversion\subversion\libsvn_wc\tree_conflicts.c'
line 570: assertion failed (strcmp(dir_path,
svn_path_dirname(victim_path, pool)) == 0)"
This looks like issue
http://subversion.tigris.org/issues/show_bug.cgi?id=3469 (tree
conflict at directory external causes assertion to fail).
It was fixed in core SVN 1.6.12 (don't know which version of
TortoiseSVN that is). So if you update to the latest TSVN version, it
will probably be fixed.
Cheers,
Johan
On Tue, Jan 25, 2011 at 11:15 AM, Joel Wahlberg <Jo...@visma.com> wrote:
>
>
>
> I’ve tried to merge some project files but ended up with:
>
>
>
>
>
> Pressing Keep the directory resulted in:
>
>
>
>
>
>
>
>
>
>
>
> <Root-project checked in>
>
> <Ciceron-project checked out from trunk>
>
>
>
> Merging from a branch with name “xxx” but with a subfolder “Ciceron” to the Root-project directory resulted in this.
>
> Windows XP SP2
>
> TortoiseSVN 1.6.7, Build 18415 - 32 Bit , 2010/01/22 17:55:06
>
> Subversion 1.6.9,
>
> apr 1.3.8
>
> apr-utils 1.3.9
>
> neon 0.29.3
>
> OpenSSL 0.9.8k 25 Mar 2009
>
> zlib 1.2.3
>
>
>
>
>
> ________________________________
>
> Joel Wahlberg
> Senior Systems Engineer, Visma Sirius
>
> Switchboard : +46 910 58 66 00 - Direct : +46 910 58 66 36 - Mobile : +46 70 551 94 86
>
> ________________________________
>
>
Re: Assert when Edit Conflict
Posted by Stefan Sperling <st...@elego.de>.
On Tue, Jan 25, 2011 at 10:15:48AM +0000, Joel Wahlberg wrote:
>
> I've tried to merge some project files but ended up with:
>
> [cid:image002.png@01CBBC80.27E388D0]
>
> Pressing Keep the directory resulted in:
>
> [cid:image001.png@01CBBC80.27E388D0]
The attached image shows the assertion described in issue #3469:
http://subversion.tigris.org/issues/show_bug.cgi?id=3469
This bug was fixed in 1.6.12. You are running 1.6.7. Please upgrade.
Stefan