From 9dfaf611f3ee0fe54c3dcbd3aa6edcbb7ce4a7af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Wed, 22 Apr 2009 12:32:29 +0000
Subject: [PATCH] * revert rev=latest change, let mls do it right in all
 places. * add hint to use "osc repairlink" on failed operations with links *
 use correct target project and package name on repairlink

---
 osc/babysitter.py  | 1 +
 osc/commandline.py | 5 +++--
 osc/core.py        | 3 ---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/osc/babysitter.py b/osc/babysitter.py
index c0e7c838..69837595 100644
--- a/osc/babysitter.py
+++ b/osc/babysitter.py
@@ -75,6 +75,7 @@ def run(prg):
 
     except oscerr.LinkExpandError, e:
         print >>sys.stderr, 'Link cannot be expanded:\n', e
+        print >>sys.stderr, 'Use "osc repairlink" to fix merge conflicts.\n'
         return 1
 
     except (oscerr.NoWorkingCopy, oscerr.WorkingCopyWrongVersion), e:
diff --git a/osc/commandline.py b/osc/commandline.py
index 24386e55..c36e10d5 100755
--- a/osc/commandline.py
+++ b/osc/commandline.py
@@ -1212,6 +1212,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
                                      expand_link=expand_link, prj_dir=project)
                 except oscerr.LinkExpandError, e:
                     print >>sys.stderr, 'Link cannot be expanded:\n', e
+                    print >>sys.stderr, 'Use "osc repairlink" for fixing merge conflicts:\n'
                     # check out in unexpanded form at least
                     checkout_package(apiurl, project, package, 
                                      expand_link=False, prj_dir=project)
@@ -2813,8 +2814,8 @@ Please submit there instead, or use --nodevelproject to force direct submission.
         dir_new = {'apiurl': apiurl}
         dir_new['srcmd5'] = root_new.get('srcmd5')
         dir_new['entries'] = map(lambda e: [e.get('name'), e.get('md5')], root_new.findall('entry'))
-        dir_new['project'] = linkinfo.get('project')
-        dir_new['package'] = linkinfo.get('package')
+        dir_new['project'] = prj
+        dir_new['package'] = package
 
         query = { 'rev': lastworkingrev }
         u = makeurl(apiurl, ['source', prj, package], query=query)
diff --git a/osc/core.py b/osc/core.py
index fdc90cb2..14d2c8b6 100755
--- a/osc/core.py
+++ b/osc/core.py
@@ -2415,9 +2415,6 @@ def checkout_package(apiurl, project, package,
     if not prj_dir:
         prj_dir = olddir
  
-    if not revision:
-        revision = "latest"
-
     if not pathname:
         pathname = getTransActPath(os.path.join(prj_dir, package))