Merge pull request #187 from bmwiedemann/changelogreverse

change ordering so that latest change is on top
openSUSE · Aug 30, 2017 · d82222e · d82222e
2 parents 8b935a3 + 14bbd7c
commit d82222e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/TarSCM/scm/git.py b/TarSCM/scm/git.py
@@ -234,7 +234,7 @@ def detect_changes_scm(self, subdir, chgs):
 
         logging.debug(dbg_msg)
 
-        lines = self._log_cmd(['--reverse', '--no-merges',
+        lines = self._log_cmd(['--no-merges',
                                '--pretty=format:%s',
                                "%s..%s" % (last_rev, current_rev)],
                               subdir)

diff --git a/TarSCM/scm/svn.py b/TarSCM/scm/svn.py
@@ -102,7 +102,7 @@ def _get_log(self, clone_dir, revision1, revision2):
         new_lines = []
 
         xml_lines = self.helpers.safe_run(
-            ['svn', 'log', '-r%s:%s' % (revision1, revision2), '--xml'],
+            ['svn', 'log', '-r%s:%s' % (revision2, revision1), '--xml'],
             clone_dir
         )[1]
 

diff --git a/tests/gitsvntests.py b/tests/gitsvntests.py
@@ -141,9 +141,9 @@ def _test_changesgenerate_new_commit_and_changes_file(self, author=None):
             expected_author,
             textwrap.dedent("""\
               - Update to version 0.6.%s:
-                \* 3
-                \* 4
                 \* 5
+                \* 4
+                \* 3
               """) % rev
         )
         self._check_changes(orig_changes, expected_changes_regexp)
@@ -171,9 +171,9 @@ def test_changesgenerate_new_commit_and_changes_file_no_version(self):
             expected_author,
             textwrap.dedent("""\
               - Update to version %s:
-                \* 3
-                \* 4
                 \* 5
+                \* 4
+                \* 3
               """) % ver_regex
         )
         self._check_changes(orig_changes, expected_changes_regexp)
@@ -201,9 +201,9 @@ def test_changesgenerate_new_commit_and_changes_file_with_subdir(self):
             expected_author,
             textwrap.dedent("""\
               - Update to version 0.6.%s:
-                \* 6
-                \* 7
                 \* 8
+                \* 7
+                \* 6
               """) % self.changesrevision(rev, abbrev=True)
         )
         self._check_changes(orig_changes, expected_changes_regexp)