Mailing List Archive

[bricoleurs/bricolage] d7b30d: Use currently-checked out asset for diff.
Branch: refs/heads/rev_1_10
Home: http://github.com/bricoleurs/bricolage

Commit: d7b30de49cfd0b8541283aad4448169f5818e7bc
http://github.com/bricoleurs/bricolage/commit/d7b30de49cfd0b8541283aad4448169f5818e7bc
Author: David E. Wheeler <david@justatheory.com>
Date: 2010-11-02 (Tue, 02 Nov 2010)

Changed paths:
M comp/widgets/media_prof/media_prof.mc
M comp/widgets/story_prof/story_prof.mc
M comp/widgets/tmpl_prof/tmpl_prof.mc
M lib/Bric/Changes.pod

Log Message:
-----------
Use currently-checked out asset for diff.

If the "to" choice is the same version as the currently-checked out version,
use the currently-checked out representation. This is so we can see changes
since the checkout.

This is not ideal, frankly, as it's a bit magical. We should consider
modifying the functionality for 2.2 so that there is another choice for
currently-checked out items, "Current version" or something. When that's
selected, the currently-checked out version should be used (for "to" or
"from"). Otherwise, use the checked-in version. I think this would be less
surprising.

Conflicts:

lib/Bric/Changes.pod