Mailing List Archive

[Bricolage #197] Bricolage fails to set the default diff version to 'last' vs 'current' on the story profile page
// Add your reply above here
==================================================
Aaron Fuleki updated this ticket at October 19th, 2010 @ 08:37 PM

Well, regardless of how & when the version numbers are incremented, this is the behavior I see on both 1.10 and 2.0:

1. Create a story, put in some content, and check it in. This becomes v1.
2. Check out the same story, make some edits, and save. Let's call this the current working copy.
3. Click the "diff" link from the story profile page. This loads the diff page.
4. By default, the diff page diffs the current working copy against itself, which isn't particularly useful (can't see the "original" v1).
5. Also frustrating is the fact that v2 doesn't exist yet (since I haven't checked the story in), and bricolage seems to treat the current working copy as v1, making it impossible to actually compare any changes I've made to a story since checking it out, because v1 isn't really v1, it's my working copy.

It seems that, when an asset is checked out, the current working copy supersedes the previous version, since they can't both use the same revision number. There needs to be some way to differentiate between the two. You can see a new record appear in the instance table when an asset is checked out, so this should be possible.

I personally think it makes the most sense to increment asset versions at checkout time, and just discard them if they are reverted or cancelled. If that's not feasible, then some other name/number should be reserved for the working copy, so diffs and other actions can refer to them directly.

What does anybody else think? It's really annoying that I have to check something in to see a diff, as that often creates bogus revisions, or forces me to just use a separate text editor entirely.
--------------------------------------------------------------------------------

Assigned: theory
State: new
Milestone: 2.0.1
View this ticket online: http://bricolage.lighthouseapp.com/projects/29601/tickets/197-bricolage-fails-to-set-the-default-diff-version-to-last-vs-current-on-the-story-profile-page
Stop being notified of this ticket's changes: http://bricolage.lighthouseapp.com/projects/29601/tickets/197-bricolage-fails-to-set-the-default-diff-version-to-last-vs-current-on-the-story-profile-page/watch
Update your Profile: http://bricolage.lighthouseapp.com/profile
Support: support@lighthouseapp.com or http://help.lighthouseapp.com
[Bricolage #197] Bricolage fails to set the default diff version to 'last' vs 'current' on the story profile page [ In reply to ]
// Add your reply above here
==================================================
phillipadsmith updated this ticket at October 20th, 2010 @ 02:29 PM

> What does anybody else think? It's really annoying that I have to check something in to see a diff, as that often creates bogus revisions, or forces me to just use a separate text editor entirely.


But what diff would you be looking for? In step two, you _know_ what changes you've made to the working copy... and, theoretically, after making those changes, you would check it in, or publish it, no? I'm unclear on the use case for a diff on the working copy (that you've just worked on) vs. the story you opened moments ago.
--------------------------------------------------------------------------------

Assigned: theory
State: new
Milestone: 2.0.1
View this ticket online: http://bricolage.lighthouseapp.com/projects/29601/tickets/197-bricolage-fails-to-set-the-default-diff-version-to-last-vs-current-on-the-story-profile-page
Stop being notified of this ticket's changes: http://bricolage.lighthouseapp.com/projects/29601/tickets/197-bricolage-fails-to-set-the-default-diff-version-to-last-vs-current-on-the-story-profile-page/watch
Update your Profile: http://bricolage.lighthouseapp.com/profile
Support: support@lighthouseapp.com or http://help.lighthouseapp.com
[Bricolage #197] Bricolage fails to set the default diff version to 'last' vs 'current' on the story profile page [ In reply to ]
// Add your reply above here
==================================================
Michael Herring updated this ticket at October 20th, 2010 @ 02:59 PM

The diff I'm looking for is what changes have been made since the asset has been checked out. Most of the time I will start working on a story and then need to stop for various reasons. When I resume editing the story I would like to know what I've already done.

Take a look at #196 for a alternate description of the problem.
--------------------------------------------------------------------------------

Assigned: theory
State: new
Milestone: 2.0.1
View this ticket online: http://bricolage.lighthouseapp.com/projects/29601/tickets/197-bricolage-fails-to-set-the-default-diff-version-to-last-vs-current-on-the-story-profile-page
Stop being notified of this ticket's changes: http://bricolage.lighthouseapp.com/projects/29601/tickets/197-bricolage-fails-to-set-the-default-diff-version-to-last-vs-current-on-the-story-profile-page/watch
Update your Profile: http://bricolage.lighthouseapp.com/profile
Support: support@lighthouseapp.com or http://help.lighthouseapp.com
[Bricolage #197] Bricolage fails to set the default diff version to 'last' vs 'current' on the story profile page [ In reply to ]
// Add your reply above here
==================================================
phillipadsmith updated this ticket at October 26th, 2010 @ 04:46 PM
* Tag changed from "1.10.9 2.0.0 bug diff" to "1.10.9 2.0.0 bug diff enhancement"
> The diff I'm looking for is what changes have been made since the asset has been checked out. Most of the time I will start working on a story and then need to stop for various reasons. When I resume editing the story I would like to know what I've already done.

I think I understand what you're after: last *version* vs. _current state_ (not current version, which is the same as the last version). Might need a new option in the diff list to make that clear, should folks feel this is the way to go.
--------------------------------------------------------------------------------

Assigned: theory
State: new
Milestone: 2.0.1
View this ticket online: http://bricolage.lighthouseapp.com/projects/29601/tickets/197-bricolage-fails-to-set-the-default-diff-version-to-last-vs-current-on-the-story-profile-page
Stop being notified of this ticket's changes: http://bricolage.lighthouseapp.com/projects/29601/tickets/197-bricolage-fails-to-set-the-default-diff-version-to-last-vs-current-on-the-story-profile-page/watch
Update your Profile: http://bricolage.lighthouseapp.com/profile
Support: support@lighthouseapp.com or http://help.lighthouseapp.com
[Bricolage #197] Bricolage fails to set the default diff version to 'last' vs 'current' on the story profile page [ In reply to ]
// Add your reply above here
==================================================
theory updated this ticket at October 26th, 2010 @ 05:16 PM

> I think I understand what you're after: last version vs. current state (not current version, which is the same as the last version). Might need a new option in the diff list to make that clear, should folks feel this is the way to go.

No, actually, Michael is right. That's how it should have worked all along.

David
--------------------------------------------------------------------------------

Assigned: theory
State: new
Milestone: 2.0.1
View this ticket online: http://bricolage.lighthouseapp.com/projects/29601/tickets/197-bricolage-fails-to-set-the-default-diff-version-to-last-vs-current-on-the-story-profile-page
Stop being notified of this ticket's changes: http://bricolage.lighthouseapp.com/projects/29601/tickets/197-bricolage-fails-to-set-the-default-diff-version-to-last-vs-current-on-the-story-profile-page/watch
Update your Profile: http://bricolage.lighthouseapp.com/profile
Support: support@lighthouseapp.com or http://help.lighthouseapp.com
[Bricolage #197] Bricolage fails to set the default diff version to 'last' vs 'current' on the story profile page [ In reply to ]
// Add your reply above here
==================================================
Michael Herring updated this ticket at October 26th, 2010 @ 05:20 PM

According to David (see bug #196) the diff I'm after (last version vs current state) is already a part of Bricolage, so I'm not sure a new option is needed.

It looks like at some point this feature was broken or removed?
--------------------------------------------------------------------------------

Assigned: theory
State: new
Milestone: 2.0.1
View this ticket online: http://bricolage.lighthouseapp.com/projects/29601/tickets/197-bricolage-fails-to-set-the-default-diff-version-to-last-vs-current-on-the-story-profile-page
Stop being notified of this ticket's changes: http://bricolage.lighthouseapp.com/projects/29601/tickets/197-bricolage-fails-to-set-the-default-diff-version-to-last-vs-current-on-the-story-profile-page/watch
Update your Profile: http://bricolage.lighthouseapp.com/profile
Support: support@lighthouseapp.com or http://help.lighthouseapp.com
[Bricolage #197] Bricolage fails to set the default diff version to 'last' vs 'current' on the story profile page [ In reply to ]
// Add your reply above here
==================================================
theory updated this ticket at October 26th, 2010 @ 05:21 PM

It was either broken or never worked properly, I'm not sure which. Fix should be backported to 1.10, too.
--------------------------------------------------------------------------------

Assigned: theory
State: new
Milestone: 2.0.1
View this ticket online: http://bricolage.lighthouseapp.com/projects/29601/tickets/197-bricolage-fails-to-set-the-default-diff-version-to-last-vs-current-on-the-story-profile-page
Stop being notified of this ticket's changes: http://bricolage.lighthouseapp.com/projects/29601/tickets/197-bricolage-fails-to-set-the-default-diff-version-to-last-vs-current-on-the-story-profile-page/watch
Update your Profile: http://bricolage.lighthouseapp.com/profile
Support: support@lighthouseapp.com or http://help.lighthouseapp.com
[Bricolage #197] Bricolage fails to set the default diff version to 'last' vs 'current' on the story profile page [ In reply to ]
// Add your reply above here
==================================================
Aaron Fuleki updated this ticket at October 26th, 2010 @ 05:30 PM

It would be great to see this behavior properly implemented/restored. It may not make sense in Phillip's example, but I have scads of assets checked out at any given time, often with many changes, often for weeks on end. Some are simple text and media elements, others contain a variety of server/client dynamic code or represent part of a larger app, not just content. Several times a day I find myself copying and pasting content into two jEdit buffers so I can actually diff them.

For example, we might be redeveloping a site (or portion of a site), and have all the relevant stories, media, and templates checked out. This could go on for a few weeks, then everything gets pushed out all at once when the finished work is deployed.

Also, sorry if there was any confusion regarding the terminology; I was just describing what's apparent in the UI.
--------------------------------------------------------------------------------

Assigned: theory
State: new
Milestone: 2.0.1
View this ticket online: http://bricolage.lighthouseapp.com/projects/29601/tickets/197-bricolage-fails-to-set-the-default-diff-version-to-last-vs-current-on-the-story-profile-page
Stop being notified of this ticket's changes: http://bricolage.lighthouseapp.com/projects/29601/tickets/197-bricolage-fails-to-set-the-default-diff-version-to-last-vs-current-on-the-story-profile-page/watch
Update your Profile: http://bricolage.lighthouseapp.com/profile
Support: support@lighthouseapp.com or http://help.lighthouseapp.com
[Bricolage #197] Bricolage fails to set the default diff version to 'last' vs 'current' on the story profile page [ In reply to ]
// Add your reply above here
==================================================
phillipadsmith updated this ticket at October 30th, 2010 @ 12:06 AM
* State changed from "new" to "open"

--------------------------------------------------------------------------------

Assigned: theory
State: open
Milestone: 2.0.1
View this ticket online: http://bricolage.lighthouseapp.com/projects/29601/tickets/197-bricolage-fails-to-set-the-default-diff-version-to-last-vs-current-on-the-story-profile-page
Stop being notified of this ticket's changes: http://bricolage.lighthouseapp.com/projects/29601/tickets/197-bricolage-fails-to-set-the-default-diff-version-to-last-vs-current-on-the-story-profile-page/watch
Update your Profile: http://bricolage.lighthouseapp.com/profile
Support: support@lighthouseapp.com or http://help.lighthouseapp.com
[Bricolage #197] Bricolage fails to set the default diff version to 'last' vs 'current' on the story profile page [ In reply to ]
// Add your reply above here
==================================================
theory updated this ticket at November 2nd, 2010 @ 11:07 PM

Okay, [fixed](http://github.com/bricoleurs/bricolage/commit/580b5656f6f5f84be635746f05b5a1cd2290c493) ([rev-2.0](http://github.com/bricoleurs/bricolage/commit/9e4a1af1a42ee378db7bc8fd7e662b6e9f3309a3), [rev_1_10](http://github.com/bricoleurs/bricolage/commit/d7b30de49cfd0b8541283aad4448169f5818e7bc)). It now will use the currently-checked out copy for the "to" target if the current version is selected.

I'm not entirely happy with this, as it's a bit magical. I think that for 2.2, we should actually modify it so that "current" is added to the select lists for diffing if you have an asset checked out. That "current" option should select the currently-checked out version. If it's not "current", but the version selected is the current version, that version as checked in would be used. I think that would be much clearer. Anyone want to take that on?
--------------------------------------------------------------------------------

Assigned: theory
State: open
Milestone: 2.0.1
View this ticket online: http://bricolage.lighthouseapp.com/projects/29601/tickets/197-bricolage-fails-to-set-the-default-diff-version-to-last-vs-current-on-the-story-profile-page
Stop being notified of this ticket's changes: http://bricolage.lighthouseapp.com/projects/29601/tickets/197-bricolage-fails-to-set-the-default-diff-version-to-last-vs-current-on-the-story-profile-page/watch
Update your Profile: http://bricolage.lighthouseapp.com/profile
Support: support@lighthouseapp.com or http://help.lighthouseapp.com
[Bricolage #197] Bricolage fails to set the default diff version to 'last' vs 'current' on the story profile page [ In reply to ]
// Add your reply above here
==================================================
phillipadsmith updated this ticket at November 12th, 2010 @ 02:59 AM
* State changed from "open" to "resolved"
I've added this as a possible to-do for the upcoming hack day:
https://github.com/bricoleurs/bricolage/wiki/Bricolage-CMS-Hack-Day,-November-22nd,-2010
--------------------------------------------------------------------------------

Assigned: theory
State: resolved
Milestone: 2.0.1
View this ticket online: http://bricolage.lighthouseapp.com/projects/29601/tickets/197-bricolage-fails-to-set-the-default-diff-version-to-last-vs-current-on-the-story-profile-page
Stop being notified of this ticket's changes: http://bricolage.lighthouseapp.com/projects/29601/tickets/197-bricolage-fails-to-set-the-default-diff-version-to-last-vs-current-on-the-story-profile-page/watch
Update your Profile: http://bricolage.lighthouseapp.com/profile
Support: support@lighthouseapp.com or http://help.lighthouseapp.com