From 94c9a3dde7004b0367c2f65429c864ead68d2175 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 29 Jan 2010 16:56:36 +0100 Subject: [PATCH] use the baserev on links by default for diffing --- NEWS | 1 + osc/core.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 01d30466..9f9454a9 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,7 @@ - fixed SSL proxy support - fixed meta attribute create and set calls - osc remotebuildlog supports a buildlogurl + - use the baserev on links by default for diffing 0.125 - add "osc pull" command to fetch and merge changes in the link target diff --git a/osc/core.py b/osc/core.py index 94a78f0a..5cf8eab6 100644 --- a/osc/core.py +++ b/osc/core.py @@ -2959,7 +2959,8 @@ def server_diff(apiurl, old_project, old_package, old_revision, new_project, new_package, new_revision, unified=False): - query = {'cmd': 'diff', 'expand': '1'} + # we default to the baserev here. an option to try to use the current base rev might be nice + query = {'cmd': 'diff', 'expand': '1', 'linkrev': 'base', 'olinkrev': 'base'} if old_project: query['oproject'] = old_project if old_package: