Mailing List Archive: [The Trac Project] #3832: changeset generation seems broken: CS sometimes won't match "svn diff -r ..."

[The Trac Project] #3832: changeset generation seems broken: CS sometimes won't match "svn diff -r ..."

Oct 1, 2006, 1:48 AM

Post #1 of 4 (2270 views)

#3832: changeset generation seems broken: CS sometimes won't match "svn diff -r
..."
-----------------------------+----------------------------------------------
Reporter: paolo | Owner: cmlenz
Type: defect | Status: new
Priority: normal | Milestone:
Component: version control | Version: 0.9.4
Severity: normal | Keywords:
-----------------------------+----------------------------------------------
hi,
this issue came up while try to track madwifi (madwifi.org) devel: I'd
grab CS then apply in order, but sometime - seems when files are moved
around - resulting CS is broken, i.e. don't match what "svn -r ..."
would report. Which sounds pretty wierd - isn't just *that* same command
used by TRAC do generate the CS?
For ref. pls see
http://article.gmane.org/gmane.linux.drivers.madwifi.devel/3246/match=ath+hal+directory

--
Ticket URL: <http://trac.edgewall.org/ticket/3832>
The Trac Project <http://trac.edgewall.org/>

--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups "Trac Tickets" group.
To post to this group, send email to trac-tickets@googlegroups.com
To unsubscribe from this group, send email to trac-tickets-unsubscribe@googlegroups.com
For more options, visit this group at http://groups.google.se/group/trac-tickets
-~----------~----~----~----~------~----~------~--~---

Re: [The Trac Project] #3832: changeset generation seems broken: CS sometimes won't match "svn diff -r ..." [ In reply to ]

noreply at edgewall

Oct 1, 2006, 6:28 AM

Post #2 of 4 (2165 views)

Permalink

#3832: changeset generation seems broken: CS sometimes won't match "svn diff -r
..."
-----------------------------+----------------------------------------------
Reporter: paolo | Owner: cmlenz
Type: defect | Status: new
Priority: normal | Milestone:
Component: version control | Version: 0.9.4
Severity: normal | Resolution:
Keywords: needinfo |
-----------------------------+----------------------------------------------
Changes (by cboos):

* keywords: => needinfo

Comment:

It's not the same command. Trac uses Python's `difflib` to compare the two
contents.

Plus, I was not really able to relate changeset the
http://madwifi.org/changeset/1742 to the example in the mail... can you be
more precise about the issue?

Also, as 0.10 is out, it might be a good idea to make a quick experimental
install, and check if the problem is still there.

--
Ticket URL: <http://trac.edgewall.org/ticket/3832#comment:1>
The Trac Project <http://trac.edgewall.org/>

--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups "Trac Tickets" group.
To post to this group, send email to trac-tickets@googlegroups.com
To unsubscribe from this group, send email to trac-tickets-unsubscribe@googlegroups.com
For more options, visit this group at http://groups.google.se/group/trac-tickets
-~----------~----~----~----~------~----~------~--~---

Re: [The Trac Project] #3832: Changeset unified diff doesn't work with new files [ In reply to ]

noreply at edgewall

Oct 2, 2006, 6:58 AM

Post #3 of 4 (2165 views)

Permalink

#3832: Changeset unified diff doesn't work with new files
-----------------------------+----------------------------------------------
Reporter: paolo | Owner: mgood
Type: defect | Status: new
Priority: normal | Milestone: 0.10.1
Component: version control | Version: 0.9.4
Severity: normal | Resolution:
Keywords: |
-----------------------------+----------------------------------------------
Changes (by mgood):

* keywords: needinfo =>
* owner: cmlenz => mgood
* summary: changeset generation seems broken: CS sometimes won't match
"svn diff -r ..." => Changeset unified diff
doesn't work with new files
* milestone: => 0.10.1

Comment:

Yeah, I was very confused by the description for this as well, but after
checking the unified diff I can see that the diff headers generated for
newly added files are incorrect. This is what Trac generates:
{{{
--- (revision )
+++ ah_target.inc (revision 1742)
@@ -1,0 +1,36 @@
}}}

It '''should''' be:
{{{
--- ah_target.inc (revision 0)
+++ ah_target.inc (revision 1742)
@@ -0,0 +1,36 @@
}}}

Patch will take the filename from the "---" line, so it needs a filename
there. Also patch gets confused by the "-1" indicated that the patch
starts at line 1 of the old file and there was no line 1. So, that needs
to be line 0.

--
Ticket URL: <http://trac.edgewall.org/ticket/3832#comment:2>
The Trac Project <http://trac.edgewall.org/>

--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups "Trac Tickets" group.
To post to this group, send email to trac-tickets@googlegroups.com
To unsubscribe from this group, send email to trac-tickets-unsubscribe@googlegroups.com
For more options, visit this group at http://groups.google.se/group/trac-tickets
-~----------~----~----~----~------~----~------~--~---

Re: [The Trac Project] #3832: Changeset unified diff doesn't work with new files [ In reply to ]

noreply at edgewall

Oct 2, 2006, 7:06 AM

Post #4 of 4 (2170 views)

Permalink