Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Automatically pull before running the "fossil merge" command, in case there have been new check-ins to the branch being merged. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
16501a04a726bb1d8d46820e2b67cf6e |
| User & Date: | drh 2015-10-26 18:00:27 |
Context
|
2015-10-27
| ||
| 01:21 | Add the 'exec-rel-paths' setting and its machinery to permit relative paths to be used when calling external diffing tools. ... (check-in: 825d78b6 user: mistachkin tags: trunk) | |
|
2015-10-26
| ||
| 18:00 | Automatically pull before running the "fossil merge" command, in case there have been new check-ins to the branch being merged. ... (check-in: 16501a04 user: drh tags: trunk) | |
| 01:18 | Skip diff for files that are ADDED_BY_INTEGRATE. ... (check-in: a6b999ce user: mistachkin tags: trunk) | |
Changes
Changes to src/merge.c.
| ︙ | ︙ | |||
224 225 226 227 228 229 230 231 232 233 234 235 236 237 |
zPivot = find_option("baseline",0,1);
verify_all_options();
db_must_be_within_tree();
if( zBinGlob==0 ) zBinGlob = db_get("binary-glob",0);
vid = db_lget_int("checkout", 0);
if( vid==0 ){
fossil_fatal("nothing is checked out");
}
/* Find mid, the artifactID of the version to be merged into the current
** check-out */
if( g.argc==3 ){
/* Mid is specified as an argument on the command-line */
mid = name_to_typed_rid(g.argv[2], "ci");
| > > > > > > | 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 |
zPivot = find_option("baseline",0,1);
verify_all_options();
db_must_be_within_tree();
if( zBinGlob==0 ) zBinGlob = db_get("binary-glob",0);
vid = db_lget_int("checkout", 0);
if( vid==0 ){
fossil_fatal("nothing is checked out");
}
if( !dryRunFlag ){
if( autosync_loop(SYNC_PULL + SYNC_VERBOSE*verboseFlag,
db_get_int("autosync-tries", 1)) ){
fossil_fatal("Cannot proceed with merge");
}
}
/* Find mid, the artifactID of the version to be merged into the current
** check-out */
if( g.argc==3 ){
/* Mid is specified as an argument on the command-line */
mid = name_to_typed_rid(g.argv[2], "ci");
|
| ︙ | ︙ |