On Sun, Jan 13, 2013 at 7:10 AM, Richard Hipp <d...@sqlite.org> wrote:
> > http://chronicleoutdoors.com/wp-content/gallery/cougar-photo/mountainlion.jpg > > I'll see what I can do about enhancing Fossil with an "approaching puma" > warning (warnings that a fork has occurred) and a "shoot puma with sidearm" > command (fossil merge with no argument). Latest Fossil on trunk contains two new features: (1) Typing just "fossil merge" without a version argument will attempt to merge any forks that exist on the current trunk. No need to go looking up the version number of the fork - Fossil will figure it out automatically. (2) After each commit in auto-sync mode, Fossil now does both a push and a pull. (Formerly it only did the push.) The extra pull means that if a fork occurred due to a race, it will be detected and a warning message will be printed. -- 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
