On Wed, May 23, 2012 at 4:23 PM, Lluís Batlle i Rossell <vi...@viric.name>wrote:
> On Wed, May 23, 2012 at 01:16:08PM -0700, Justin Gedge wrote: > > Uncovered a bug. In this case, two users working in their own fossil > work > > areas independently created a file with the same name. Each file is > > unique. Fossil identifies that there is a conflict, but does NOT attempt > > to merge the files. Commands to duplicate issue follow: > > How would fossil merge two files with no base data? What algorithm would do > that? > Thanks for the bug report. But I think Lluís is right: There isn't anything Fossil (or any other DVCS) can do with situation, other than report the conflict to the user, which Fossil did do according to your log. So, unless somebody can suggest something better, I think that the current behavior is correct. > _______________________________________________ > fossil-users mailing list > fossil-users@lists.fossil-scm.org > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > -- D. Richard Hipp d...@sqlite.org
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
