Re: TortoiseSVN Notification: vendor branches (steveking)

On 14/03/2008, TortoiseSVN <issues_at_tortoisesvn.tigris.org> wrote:

Moving discussion onto dev list to avoid cluttering the tracker.

> After checking svn_load_dirs.pl, I think we should use another approach, basically only working on working copies.
> Here's what I was thinking:
>
>
> * The user has the vendor library checked out already somewhere.
> * user right-clicks on that working copy folder, chooses "upgrade library" (or something like that, the command name is up for discussion)
> * TSVN scans the working copy for files and folders, builds a list and shows that list in a dialog.
> * TSVN asks the user where the new version of the library is
> * TSVN scans the new library for files and folders, builds the list and shows that list on the right of the original list
> * TSVN tries to guess which files have been moved (comparing the filenames), which ones have been modified
> * TSVN marks files which are only present in one of the lists as either added or removed
> * the user can then assign files of those 'added/removed' items, basically telling TSVN that those files got renamed/moved
> * user clicks on "OK" and TSVN executed the 'add' and 'delete' commands

This sounds like a major operation. Something new and exciting for 1.6 :-)

> I'm not sure if it would be a good idea to try and get a diff first from the vendor wc to where it was created (to get the diff of all changes the user applied to the vendor branch) and later apply that patch again or do a merge. Because personally, I've never done that before (i.e., first committed the external library without changes, then applied my changes and committed again - I've always added my changes **before** I did the first commit).

Vendor branches as described in the subversion book operate a little
differently. You never modify the vendor code yourself. You keep the
original vendor code separate and then apply the diff made to the
vendor code to your local customized version. So there would always be
2 commits.

Simon

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: dev-help_at_tortoisesvn.tigris.org