Conflict review diffs show wrong source version

[ietf-svn-bot]

resolution_fixed type_defect | by rjsparks@nostrum.com

---

https://datatracker.ietf.org/doc/conflict-review-gont-dhcpv6-stable-privacy-addresses/history/

Shows 3 versions for that conflict review. The display of each new version DocEvent also shows links for diff from previous version, but the URL for the link is constructed badly.

For -01 it tries to diff -00 and -00.
For -02 it tries to diff -00 and -02.

If you use the diff tool at the top of the history tab, with -01 and -02 selected (the defaults), it returns a diff from -00 to -02.

---

Issue migrated from trac:1972 at 2022-03-04 04:59:05 +0000

[ietf-svn-bot]

@rjsparks@nostrum.com commented

---

This is a result of not synchronizing the timestamp of a DocHistory row and a DocEvent when a new revision of the conflict-review is submitted.

There is separate work coming into the tree soon that makes that synchronization more natural. The conflict-review code (and other places) will be adjusted to make use of it once it's available.

Repairing the existing conflict review documents should not be hard to do - there are few enough of them, that a manual effort is probably sufficient. The affected documents (with timestamps) are:

(find_badhistory is a copy of find_history that returns the history record just _before_ the record that find_history would return).

In 23a30e614bc040205e2a0074615f6582d68efe47: for doc in docs:
    for e in NewRevisionDocEvent.objects.filter(doc=doc):
        h = find_history_active_at(e.doc,e.time)
        if h.rev != e.rev:
            h2 = find_badhistory_active_at(e.doc,e.time)
   ....:             print doc,h2.rev,h2.time,e.rev,e.time
   ....:
conflict-review-irtf-samrg-common-api 02 2013-10-04 10:38:54 02 2013-10-04 10:38:52
conflict-review-irtf-dtnrg-dgram-clayer 02 2013-08-25 08:46:03 02 2013-08-25 08:45:53 <- 10 seconds!
conflict-review-irtf-dtnrg-dgram-clayer 01 2013-08-24 12:25:14 01 2013-08-24 12:25:13
conflict-review-hausenblas-csv-fragment 02 2013-10-10 10:17:53 02 2013-10-10 10:17:52
conflict-review-hoffine-already-dotless 04 2013-10-10 15:53:14 04 2013-10-10 15:53:13
conflict-review-irtf-sdnrg-layer-terminology 01 2014-10-11 06:51:30 01 2014-10-11 06:51:29
conflict-review-gont-dhcpv6-stable-privacy-addresses 01 2016-05-18 17:51:58 01 2016-05-18 17:51:55 

[ietf-svn-bot]

@rjsparks@nostrum.com changed status from new to closed

[ietf-svn-bot]

@rjsparks@nostrum.com changed resolution from `` to fixed

[ietf-svn-bot]

@rjsparks@nostrum.com commented

---

Fixed in cebcd61:

Straightened out some DocHistory timestamps that did not align with the respective DocEvent timestamps. Fixes #1972. Commit ready for merge.

[ietf-svn-bot]

@rjsparks@nostrum.com commented

---

I verified that these were still the only broken conflrev docs, and fixed them.

However, there are many documents of other types (particularly charter and draft) that have a similar issue - some of them will not be as easy to fix because a history row was not added at all.

[ietf-svn-bot]

@henrik@levkowetz.com commented

---

Fixed in 2ad08d6:

Merged in cebcd61 from rjsparks@nostrum.com:
Straightened out some DocHistory timestamps that did not align with the respective DocEvent timestamps. Fixes #1972.