Differences From Artifact [0972498027]:

• File src/branch.c — part of check-in [7ab03289ee] at 2015-04-27 13:19:51 on branch trunk — Provide help text for all commands and webpages. (user: drh size: 17374) [more...]

To Artifact [fb34c1491e]:

• File src/branch.c — part of check-in [d5575d14de] at 2016-05-30 22:25:29 on branch autosync-failure-prompt — On a merge or update, prompt to continue of autosync fails, just like is done for commit. (user: drh size: 17375) [more...]

174
175
176
177
178
179
180
181
182
183
184
185
186
187
188

  }


  /* Commit */
  db_end_transaction(0);

  /* Do an autosync push, if requested */
  if( !isPrivate ) autosync_loop(SYNC_PUSH, db_get_int("autosync-tries", 1));
}

#if INTERFACE
/*
** Allows bits in the mBplqFlags parameter to branch_prepare_list_query().
*/
#define BRL_CLOSED_ONLY      0x001 /* Show only closed branches */

|

174
175
176
177
178
179
180
181
182
183
184
185
186
187
188

  }


  /* Commit */
  db_end_transaction(0);

  /* Do an autosync push, if requested */
  if( !isPrivate ) autosync_loop(SYNC_PUSH, db_get_int("autosync-tries",1),0);
}

#if INTERFACE
/*
** Allows bits in the mBplqFlags parameter to branch_prepare_list_query().
*/
#define BRL_CLOSED_ONLY      0x001 /* Show only closed branches */