diff options
| author | Peter Wemm <peter@FreeBSD.org> | 2018-05-08 03:44:38 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 2018-05-08 03:44:38 +0000 |
| commit | 3faf8d6bffc5d0fb2525ba37bb504c53366caf9d (patch) | |
| tree | 7e47911263e75034b767fe34b2f8d3d17e91f66d /subversion/libsvn_wc/entries.c | |
| parent | a55fb3c0d5eca7d887798125d5b95942b1f01d4b (diff) | |
| download | src-3faf8d6bffc5d0fb2525ba37bb504c53366caf9d.tar.gz src-3faf8d6bffc5d0fb2525ba37bb504c53366caf9d.zip | |
Import Subversion-1.10.0vendor/subversion/subversion-1.10.0
Notes
Notes:
svn path=/vendor/subversion/dist/; revision=333347
svn path=/vendor/subversion/subversion-1.10.0/; revision=333348; tag=vendor/subversion/subversion-1.10.0
Diffstat (limited to 'subversion/libsvn_wc/entries.c')
| -rw-r--r-- | subversion/libsvn_wc/entries.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/subversion/libsvn_wc/entries.c b/subversion/libsvn_wc/entries.c index 1be6a8bec870..5748aa3cb857 100644 --- a/subversion/libsvn_wc/entries.c +++ b/subversion/libsvn_wc/entries.c @@ -1800,7 +1800,7 @@ write_entry(struct write_baton **entry_node, normal replace+copied base base+work add+copied replace+copied work work+work - although obviously the node is a directory rather then a file. + although obviously the node is a directory rather than a file. There are then more conversion states where the parent is replaced. @@ -2004,7 +2004,7 @@ write_entry(struct write_baton **entry_node, if (entry_node && entry->tree_conflict_data) { /* Issues #3840/#3916: 1.6 stores multiple tree conflicts on the - parent node, 1.7 stores them directly on the conflited nodes. + parent node, 1.7 stores them directly on the conflicted nodes. So "((skel1) (skel2))" becomes "(skel1)" and "(skel2)" */ svn_skel_t *skel; |