Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Print description of conflict when 'stash apply' cannot merge a symlink and a regular file. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | symlinks |
| Files: | files | file ages | folders |
| SHA1: |
bca6924e5ff67a5ffa89517a81a357d0 |
| User & Date: | dmitry 2011-09-02 10:34:59 |
Context
|
2011-09-02
| ||
| 12:27 | Merge latest trunk into symlinks branch. check-in: fee3c676 user: dmitry tags: symlinks | |
| 10:34 | Print description of conflict when 'stash apply' cannot merge a symlink and a regular file. check-in: bca6924e user: dmitry tags: symlinks | |
| 10:19 | Uncomment contents of Makefile.in. Silence OpenSSL deprecation warnings on Mac OS X 10.7. check-in: 73443aa7 user: dmitry tags: symlinks | |
Changes
Changes to src/stash.c.
230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 |
file_setexe(zNPath, isExec);
fossil_print("UPDATE %s\n", zNew);
}else{
int rc;
if( isLink || isNewLink ){
rc = -1;
blob_zero(&b); /* because we reset it later */
//TODO(dchest): write something to disk?
}else{
rc = merge_3way(&a, zOPath, &b, &out);
blob_write_to_file(&out, zNPath);
//blob_reset(&out); //XXX(dchest): Need this?
}
file_setexe(zNPath, isExec);
if( rc ){
fossil_print("CONFLICT %s\n", zNew);
nConflict++;
}else{
fossil_print("MERGE %s\n", zNew);
}
}
|
| | | | |
230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 |
file_setexe(zNPath, isExec);
fossil_print("UPDATE %s\n", zNew);
}else{
int rc;
if( isLink || isNewLink ){
rc = -1;
blob_zero(&b); /* because we reset it later */
fossil_print("***** Cannot merge symlink %s\n", zNew);
}else{
rc = merge_3way(&a, zOPath, &b, &out);
blob_write_to_file(&out, zNPath);
blob_reset(&out);
file_setexe(zNPath, isExec);
}
if( rc ){
fossil_print("CONFLICT %s\n", zNew);
nConflict++;
}else{
fossil_print("MERGE %s\n", zNew);
}
}
|