Re: [fossil-users] More merge problems with renames

2011-06-14 Thread Lluís Batlle i Rossell
On Thu, Jun 02, 2011 at 06:24:16AM -0400, Richard Hipp wrote: 2011/6/2 Lluís Batlle i Rossell virik...@gmail.com What do you think about the problem? Do you understand it already, or you would really like a repository with the troubles, in order to start? I'd have to recreate one

Re: [fossil-users] More merge problems with renames

2011-06-02 Thread Lluís Batlle i Rossell
On Wed, Jun 01, 2011 at 07:35:09AM -0400, Richard Hipp wrote: 2011/6/1 Lluís Batlle i Rossell virik...@gmail.com Hello, still with the opened issue http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg04716.html, we commited such a 'bad merge' into one of our branches. As

Re: [fossil-users] More merge problems with renames

2011-06-02 Thread Richard Hipp
2011/6/2 Lluís Batlle i Rossell virik...@gmail.com What do you think about the problem? Do you understand it already, or you would really like a repository with the troubles, in order to start? I'd have to recreate one artificially, to show the problems, as I've only seen that in the

[fossil-users] More merge problems with renames

2011-06-01 Thread Lluís Batlle i Rossell
Hello, still with the opened issue http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg04716.html , we commited such a 'bad merge' into one of our branches. As there explained, the 'shortest path' used to calculate the renames was clearly wrong. We decided to go to the previous

Re: [fossil-users] More merge problems with renames

2011-06-01 Thread Richard Hipp
2011/6/1 Lluís Batlle i Rossell virik...@gmail.com Hello, still with the opened issue http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg04716.html, we commited such a 'bad merge' into one of our branches. As there explained, the 'shortest path' used to calculate the renames

Re: [fossil-users] More merge problems with renames

2011-06-01 Thread Lluís Batlle i Rossell
On Wed, Jun 01, 2011 at 07:35:09AM -0400, Richard Hipp wrote: 2011/6/1 Lluís Batlle i Rossell virik...@gmail.com Hello, still with the opened issue http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg04716.html, we commited such a 'bad merge' into one of our branches. As

Re: [fossil-users] More merge problems with renames

2011-06-01 Thread Lluís Batlle i Rossell
On Wed, Jun 01, 2011 at 07:35:09AM -0400, Richard Hipp wrote: 2011/6/1 Lluís Batlle i Rossell virik...@gmail.com Hello, still with the opened issue http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg04716.html, we commited such a 'bad merge' into one of our branches. As