Hello  all

 

I’m trying to patch the TicketBox.py with TicketBox.diffs  so that I have a box with the description of the tickets.

 

When I do this:

 

“patch TicketBox.py TicketBox.diffs”

 

It reports this:

patching file TicketBox.py

Hunk #5 FAILED at 113.

Hunk #6 FAILED at 127.

Hunk #7 FAILED at 138.

Hunk #8 FAILED at 148.

4 out of 8 hunks FAILED -- saving rejects to file TicketBox.py.rej

 

Here is my TicketBox.py.rej:

***************

*** 101

-                         items.append(row[idx])

--- 113,116 -----

+                         if items_have_text:

+                           items.append("#%d: %s"%(row[idx], row[text]))

+                         else:

+                         items.append("#%d"%row[idx])

***************

*** 112,113

-         from trac.wiki.formatter import wiki_to_oneliner

-         html = wiki_to_oneliner(string.join(["#%d" % c for c in items], ", "),

--- 127,133 -----

+         from trac.wiki.formatter import wiki_to_oneliner, wiki_to_html

+         if items_have_text:

+           html = wiki_to_html(string.join(["%s" % str(c) for c in items],

+                                           "[[BR]]"),

+                                env, env.get_db_cnx())

+         else:

+           html = wiki_to_oneliner(string.join(["%s" % str(c) for c in items], ", "),

***************

*** 118

-         html = wiki_to_oneliner(string.join(["#%d" % c for c in items], ", "),

--- 138,139 -----

+         html = wiki_to_oneliner(string.join(["%s" % str(c) for c in items],

+ sep),

***************

*** 127,128

-         return '<fieldset class="ticketbox"

- style="%s"><legend>%s</legend>%s</fieldset>' % \

--- 148 -----

+         return '<fieldset class="ticketbox" style="%s"><legend>%s</legend>%s</fieldset>' % \

 

 

 

How can I solve this?

 

Thanks in advance!


--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups "Trac Users" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at http://groups.google.com/group/trac-users
-~----------~----~----~----~------~----~------~--~---

Reply via email to