Fossil

Check-in [d685096f]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:On a merge or update, prompt to continue of autosync fails, just like is done for commit.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:d685096f99a977909bcb8931a55d5cba2e02819c
User & Date: drh 2016-05-30 22:30:46
Context
2016-05-31
01:16
Improved handling of exclude_robots(). Add the "isrobot" query parameter for testing. check-in: abcd5df2 user: drh tags: trunk
2016-05-30
22:30
On a merge or update, prompt to continue of autosync fails, just like is done for commit. check-in: d685096f user: drh tags: trunk
22:25
On a merge or update, prompt to continue of autosync fails, just like is done for commit. Closed-Leaf check-in: d5575d14 user: drh tags: autosync-failure-prompt
21:10
Add a new robot detection string. check-in: 1e2d76ec user: drh tags: trunk
Changes
Unified Diffs Side-by-Side Diffs Patch

Changes to src/branch.c.

Changes to src/checkin.c.

Changes to src/merge.c.

Changes to src/sync.c.

Changes to src/update.c.