#113 Diffing to branch's first rev should choose branch point

closed-fixed
nobody
None
5
2007-11-13
2007-01-15
No

I have this in the branch browser:

F
|
A E
| |
B------------------D
|
C

I click on E and D, and open up a diff.

Expected result: I get a diff between E and B (since B is the same a D)
Actual result: Diff between E and F (!)

When I click on the first rev of the branch, I want the first rev, not a synonym for the latest revision on the branch.

This used to work in the previous release of tkcvs.

I realize it's possible to scroll and click B, but sometimes B is a long way away from D and it takes quite a lot of scrolling to do it.

Discussion

  • Scott Tringali

    Scott Tringali - 2007-01-15

    Branch diagram

     
  • Scott Tringali

    Scott Tringali - 2007-01-15

    Logged In: YES
    user_id=11321
    Originator: YES

    Sorry, the diagram got messed up. See attachment.
    File Added: diagram.txt

     
  • DorothyR

    DorothyR - 2007-06-13

    Logged In: YES
    user_id=18012
    Originator: NO

    Is D the blue branchtag box? I'm afraid the bug here is that you can invisibly select it at all. To CVS, r1.2.2 really _is_ a synonym for the latest revision on the branch, ie 1.2.2.2 - the same as if you said "cvs update -r<symbolic branch tag>.

     
  • Scott Tringali

    Scott Tringali - 2007-06-19

    Logged In: YES
    user_id=11321
    Originator: YES

    Yes, D is the blue box. You can select it, and it's really selected, but it doesn't highlight.

    I know what it really is in CVS, but I really want an easy way to diff back to the branching point without scrolling. Maybe a separate "diff to branch point" that didn't require a second selection would help.

    I spend a lot of time using tkcvs+tkdiff to help resolve merge conflicts when doing branch merges. Figuring out the changes since the branch point is a very common operation, but it's impractical to scroll back to the trunk.

    I think the problem is that the blue box has an arrow coming out of B, which implies that it's a rev or closely related to B. It would be better to not draw it at all. Maybe a view option to hide them?

     
  • DorothyR

    DorothyR - 2007-11-13
    • status: open --> closed-fixed
     
  • DorothyR

    DorothyR - 2007-11-13

    Logged In: YES
    user_id=18012
    Originator: NO

    Made the blue branch box un-selectable. It was pretty much an accident that it worked for diffs at all.

     

Log in to post a comment.

Get latest updates about Open Source Projects, Conferences and News.

Sign up for the SourceForge newsletter:

JavaScript is required for this form.





No, thanks