locked
Branc Specifications RRS feed

  • Question

  • How does TFS handle files that have moved from one location within a given branch, to another folder within that same branch?

    In Perforce, you could handle this with either a manual integration, or by setting up a branch specification. Either way maintains the branching history.

    Also, concerning the database.  How does TFS handle storing the initial depot of branched/integrated files in the database? Are the files of the new branch stored in the database in their complete form, or is just a link stored (to where they were branched from)?


    Wednesday, July 26, 2006 1:26 PM

Answers

  • In TFS, renames/moves are first-class change types. When you merge to
    another branch, TFS will pend equivalent renames on the target items.
    (We also throw a conflict, our way of saying “this is unusual, are you
    sure?” Resolving with AcceptMerge will bring over the name change by
    default.)

    Branched files are stored as diffs. The initial branch has no space
    overhead other than new rows for the target item. However, this is a
    couple layers of abstraction below the rest of the version control
    business logic. Commands like Merge & Resolve always operate on
    complete file versions.
    Wednesday, July 26, 2006 6:29 PM
    Moderator

All replies

  • In TFS, renames/moves are first-class change types. When you merge to
    another branch, TFS will pend equivalent renames on the target items.
    (We also throw a conflict, our way of saying “this is unusual, are you
    sure?” Resolving with AcceptMerge will bring over the name change by
    default.)

    Branched files are stored as diffs. The initial branch has no space
    overhead other than new rows for the target item. However, this is a
    couple layers of abstraction below the rest of the version control
    business logic. Commands like Merge & Resolve always operate on
    complete file versions.
    Wednesday, July 26, 2006 6:29 PM
    Moderator
  • Thank you, I was hoping for those answers.
    Wednesday, July 26, 2006 9:50 PM