diff options
| author | Peter Wemm <peter@FreeBSD.org> | 2015-08-09 04:37:39 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 2015-08-09 04:37:39 +0000 |
| commit | 58218291fa73a17020ef0447398e9e8a78f9e8c7 (patch) | |
| tree | 78a13bd0acf7405df6eb6ca94a4e354d124065a6 /subversion/libsvn_wc/entries.c | |
| parent | 6f0665939667af9f780762878fc35982e8b7d745 (diff) | |
| download | src-58218291fa73a17020ef0447398e9e8a78f9e8c7.tar.gz src-58218291fa73a17020ef0447398e9e8a78f9e8c7.zip | |
Vendor import subversion-1.8.14vendor/subversion/subversion-1.8.14
Notes
Notes:
svn path=/vendor/subversion/dist/; revision=286501
svn path=/vendor/subversion/subversion-1.8.14/; revision=286502; tag=vendor/subversion/subversion-1.8.14
Diffstat (limited to 'subversion/libsvn_wc/entries.c')
| -rw-r--r-- | subversion/libsvn_wc/entries.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/subversion/libsvn_wc/entries.c b/subversion/libsvn_wc/entries.c index f6a73bf33134..24dae50c0ca8 100644 --- a/subversion/libsvn_wc/entries.c +++ b/subversion/libsvn_wc/entries.c @@ -2140,17 +2140,18 @@ write_entry(struct write_baton **entry_node, below_working_node->presence = svn_wc__db_status_normal; below_working_node->kind = entry->kind; below_working_node->repos_id = work->repos_id; + below_working_node->revision = work->revision; /* This is just guessing. If the node below would have been switched or if it was updated to a different version, the guess would fail. But we don't have better information pre wc-ng :( */ if (work->repos_relpath) below_working_node->repos_relpath - = svn_relpath_join(work->repos_relpath, entry->name, + = svn_relpath_join(work->repos_relpath, + svn_relpath_basename(local_relpath, NULL), result_pool); else below_working_node->repos_relpath = NULL; - below_working_node->revision = parent_node->work->revision; /* The revert_base checksum isn't available in the entry structure, so the caller provides it. */ |