File tree Expand file tree Collapse file tree 2 files changed +11
-0
lines changed
src/SVNBuddy/Repository/CommitMessage Expand file tree Collapse file tree 2 files changed +11
-0
lines changed Original file line number Diff line number Diff line change @@ -14,6 +14,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
14
14
### Fixed
15
15
- Attempt to print commit history of paths copied to themselves (e.g. trunk > branches/something > trunk) resulted in a recursion.
16
16
- The ` --no-merges ` option of ` merge ` command wasn't used during actual merge, but only to display to be merged revisions.
17
+ - The ` Reverse-merge of ... ` heading was shown even on strait merges (not reverse ones), when ` commit ` command was using ` summary ` merge template.
17
18
18
19
## [ 0.5.2] - 2019-06-20
19
20
### Fixed
Original file line number Diff line number Diff line change @@ -50,11 +50,21 @@ public function apply($wc_path)
50
50
$ ret = '' ;
51
51
52
52
foreach ( $ merged_revisions as $ path => $ revisions ) {
53
+ // No changes on particular path.
54
+ if ( !$ revisions ) {
55
+ continue ;
56
+ }
57
+
53
58
$ source = $ this ->getMomentInTime ($ path , max ($ revisions ));
54
59
$ ret .= PHP_EOL . 'Merge of " ' . $ source . '" to " ' . $ target . '". ' . PHP_EOL ;
55
60
}
56
61
57
62
foreach ( $ unmerged_revisions as $ path => $ revisions ) {
63
+ // No changes on particular path.
64
+ if ( !$ revisions ) {
65
+ continue ;
66
+ }
67
+
58
68
$ source = $ this ->getMomentInTime ($ path , max ($ revisions ));
59
69
$ ret .= PHP_EOL . 'Reverse-merge of " ' . $ source . '" to " ' . $ target . '". ' . PHP_EOL ;
60
70
}
You can’t perform that action at this time.
0 commit comments