[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Vendor Branch Here

From: Gavin Lambert <tsvn_at_mirality.co.nz>
Date: Fri, 18 Oct 2013 11:09:05 +1300

On 18/10/2013 02:45, Quoth Ben Fritz:
> So how about this instead?
> 1. Check out /vendor/libname
> 2. Right-click-drag the folder containing the newer code over the top
> of /vendor/libname
> 3. check for modifications
> 4. do a "repair move" for any files that did get renamed (will this
> work? maybe there is a manual "undo add" and such needed first)
> 5. commit
> 6. go back to normal WC and do a plain old normal merge from /vendor/libname
> 7. fix up any conflicts
> 8. test and commit
> If step (4) doesn't work, then maybe the "repair move" feature needs a
> little improvement for use cases like this. I don't know because most
> of the time I use that feature it is only because of things like
> upgrading file formats and such where the program editing the file
> actually renames the file to a new file extension. I've never actually
> tried this "vendor branch" feature.

Is "repair move" an actual feature somewhere? I've never managed to
find it if so. (I know how to do it manually of course.)

And that workflow probably ought to work too. Again, my point is that
there isn't any documented guidance on it one way or the other (or a
third) except for what's in the SVN book, which doesn't match what the
TSVN feature does.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-10-18 00:10:27 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.