Re: CVS update: subversion/subversion/libsvn_fs editor.c

sussman@tigris.org writes:

> User: sussman
> Date: 01/03/18 17:52:39
>
> Modified: subversion/libsvn_fs editor.c
> Log:
> Bugfix: make the fs commit editor deal with mixed-revision working
> copies.

Mike Pilato: I'm pretty darn sure I made this change correctly.
However, when I try to reproduce Fitz's "double commit" bug, I'm
getting an SVN_ERR_FS_CONFLICT in merge() (tree.c, line 1257). I'm
not so familiar with merge, so maybe you can figure out what's going
on?

Take a look at editor.c:replace_file(). Notice that I'm firstly
deleting iota, then doing an svn_fs_copy of iota from the
base_revision tree to the active transaction. This all goes
swimmingly. I'm guessing there's some subtle bug in merge(), though.
Received on Sat Oct 21 14:36:26 2006