search

azzurris / git-repo

Automatically exported from code.google.com/p/git-repo
Apache License 2.0
0 stars 0 forks source link

Traceback on repo status during merge with conflicts #15

Closed GoogleCodeExporter closed 9 years ago

GoogleCodeExporter commented 9 years ago 
Reported by Wink Saville <wink@google.com> on Tue Mar 03 12:24:23 PST 2009
Source: JIRA REPO-15
Affected Version: 1.6.1

$ repo status
project frameworks/base/                        (*** NO BRANCH ***)
 M-     Android.mk
 M-     core/java/android/net/MobileDataStateTracker.java
 M-     core/java/android/pim/ContactsAsyncHelper.java
 M-     core/java/android/provider/Checkin.java
 M-     core/java/android/provider/Settings.java
 --     core/java/android/provider/Settings.java.BASE.21007.java
 --     core/java/android/provider/Settings.java.LOCAL.21007.java
 --     core/java/android/provider/Settings.java.REMOTE.21007.java
 M-     core/java/android/webkit/gears/AndroidRadioDataProvider.java
.....
.....
.....
 A-     telephony/java/android/telephony/cdma/TtyIntent.java
 M-     telephony/java/android/telephony/gsm/GsmCellLocation.java
 Um     telephony/java/android/telephony/gsm/SmsManager.java
 Um     telephony/java/android/telephony/gsm/SmsMessage.java
Traceback (most recent call last):
  File "/usr/local/google/users/wink/repo-clients/master/.repo/repo/main.py",
line 202, in ?
    _Main(sys.argv[1:])
  File "/usr/local/google/users/wink/repo-clients/master/.repo/repo/main.py",
line 186, in _Main
    repo._Run(argv)
  File "/usr/local/google/users/wink/repo-clients/master/.repo/repo/main.py",
line 96, in _Run
    cmd.Execute(copts, cargs)
  File "/usr/local/google/users/wink/repo-clients/master/.repo/repo/subcmds/
status.py", line 27, in Execute
    project.PrintWorkTreeStatus()
  File "/usr/local/google/users/wink/repo-clients/master/.repo/repo/
project.py", line 362, in PrintWorkTreeStatus
    line = ' %s%s\t%s => (%s%%)' % (i_status, f_status,
TypeError: not all arguments converted during string formatting

Original issue reported on code.google.com by code-rev...@gtempaccount.com on 24 Sep 2009 at 9:09

GoogleCodeExporter commented 9 years ago 
Comment by Shawn Pearce <sop@google.com> on Tue Mar 03 13:50:59 PST 2009

Turns out this happens on renamed/copied files where there is a similarity
indicator.  I missed a format parameter.

Fixed by https://review.source.android.com/9056

Original comment by code-rev...@gtempaccount.com on 24 Sep 2009 at 9:10

GoogleCodeExporter commented 9 years ago 
Update by Shawn Pearce <sop@google.com> on Tue Mar 03 13:50:59 PST 2009

Fixed in version 1.6.1.

Original comment by code-rev...@gtempaccount.com on 24 Sep 2009 at 9:10