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