Fossil

Timeline
Login

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

39 check-ins related to "sync-forkwarn"

2015-05-30
08:53
[7699d14104] Leaf: merge trunk (user: jan.nijtmans tags: sync-forkwarn)
04:15
[a3c6971a1b] Fix one-character typo in changelog. (user: andygoth tags: trunk)
2015-05-20
11:45
[9f507ffe49] Merge trunk (user: jan.nijtmans tags: sync-forkwarn)
2015-05-19
19:22
[4742716fc1] Revert [48499514cc], changing nUsed to zero is not redundant as blob_append() changes it to one. (user: mistachkin tags: trunk)
2015-05-07
19:28
[c1416fd133] merge trunk (user: jan.nijtmans tags: sync-forkwarn)
12:31
[abc38398eb] Change the built-in SQLite to version 3.8.10. (user: drh tags: trunk)
2015-04-29
09:17
[97ab502fca] merge trunk (user: jan.nijtmans tags: sync-forkwarn)
07:53
[897acdc89f] typo (user: jan.nijtmans tags: trunk)
2015-04-27
21:00
[35743de449] Merge trunk. Change back one instance of "multiple leafs" to "fork": Here we are sure that it's really a "fork", not some other form of multiple leafs on the same branch. (user: jan.nijtmans tags: sync-forkwarn)
20:46
[cd0d6b4dda] Use "multiple leaves on the same branch" in stead of "ambiguous branch". Let's see if people like this better. (user: jan.nijtmans tags: sync-forkwarn)
19:27
[fc3d9f52ee] Remove unnecessary end-of-line spacing (user: jan.nijtmans tags: trunk)
19:18
[b9fbfac5ff] warning message fix (user: jan.nijtmans tags: sync-forkwarn)
19:14
[2dc4d98e3b] merge trunk (user: jan.nijtmans tags: sync-forkwarn)
14:39
[76cd08baf6] Minor spelling correction. (user: andybradford tags: sync-forkwarn)
13:19
[7ab03289ee] Provide help text for all commands and webpages. (user: drh tags: trunk)
2015-04-26
17:26
[fe7f6f3cc1] Another "fork" -> "ambigeous branch" change (user: jan.nijtmans tags: sync-forkwarn)
17:12
[4359bd8df2] Combine "fossil forks" with "fossil info" command (user: jan.nijtmans tags: sync-forkwarn)
2015-04-25
20:38
[560483f504] Add warning to "fossil sync", when a new fork is created during this sync. (user: jan.nijtmans tags: trunk)
2015-04-23
00:35
[64b221aacf] Closed-Leaf: Only check leaves for forks on multi-child nodes. This prevents warnings from being extra verbose when a commit is made on any of the forks. (user: andybradford tags: sync-forkwarn)
2015-04-22
19:10
[101fdfe89a] Remove unused variable (user: jan.nijtmans tags: sync-forkwarn)
16:32
[e1f614f3b8] Style consistency change only. (user: andybradford tags: sync-forkwarn)
05:21
[b9728c4aa2] Only check for forks in newly received content after all round-trips of sync have completed. (user: andybradford tags: sync-forkwarn)
2015-04-19
18:26
[cf59ea3165] Merge trunk. More to-the-point message in case of fork warnings after sync. (user: jan.nijtmans tags: sync-forkwarn)
2015-04-17
09:50
[af52f2912a] Cherry-pick [http://www.sqlite.org/src/info/e018f4bf1f27f7838342940ad89a12d7f1536e8e|e018f4bf1f]: Fix a potential one-byte buffer overread in the command-line shell. Add (undocumented) -backslash option to "fossil sqlite" (user: jan.nijtmans tags: trunk)
00:11
[eab553c77e] Merge in new feature from trunk. (user: andybradford tags: sync-forkwarn)
2015-04-16
23:46
[97f976785d] Allow fossil_find_nearest_fork to be used on repository that is not open. (user: andybradford tags: trunk)
2015-04-14
00:42
[bc1e943fec] Remove unused code from previous fork warning method. (user: andybradford tags: sync-forkwarn)
2015-04-13
08:30
[731042d5ea] Merge trunk (user: jan.nijtmans tags: sync-forkwarn)
08:29
[5c40f8565e] Better fork detection on [/help?cmd=update|fossil update], [/help?cmd=status|fossil status] and related commands. (user: jan.nijtmans tags: trunk)
03:38
[d0e2f1bd3e] Use better fork detection mechanism and disable checking during push since it may not have a complete sync and issue warning prematurely. (user: andybradford tags: sync-forkwarn)
03:31
[ebce686332] Bring in needed changes from related branch. (user: andybradford tags: sync-forkwarn)
2015-04-11
02:23
[6e10a4b102] Now don't issue warnings during cloning. (user: andybradford tags: sync-forkwarn)
01:56
[4f734aa219] Pull in latest from trunk. (user: andybradford tags: sync-forkwarn)
01:54
[a36ec9f9d9] Enable function to know if sync is clone. (user: andybradford tags: sync-forkwarn)
2015-04-10
17:33
[72794ec975] Closed-Leaf: Only check for forks on "open" leaves, otherwise we cannot do anything about it from here anyway. Thanks to Andy Bradford for noticing this. (user: jan.nijtmans tags: update-fork-warn)
05:31
[d397f1cdc4] Minor correction to comment, no code change. (user: andybradford tags: trunk)
00:30
[9d45319345] Add warnings to clients which receive content that creates a fork. Defer warnings as much as possible. (user: andybradford tags: sync-forkwarn)
2015-04-09
00:51
[6b410f914e] Warn the client that pushes content which generates a fork on the server. (user: andybradford tags: sync-forkwarn)
2015-04-08
17:05
[5a12e8c3b6] Improve some comments. No changes to code. (user: mistachkin tags: trunk)