Login | Register
My pages Projects Community openCollabNet

Discussions > users > RE: Re: Check-out, revert, and branch/merge strategies?

fsvs
Discussion topic

Back to topic list

RE: Re: Check-out, revert, and branch/merge strategies?

Author "Worley, Chris B" <chris dot b dot worley at intel dot com>
Full name "Worley, Chris B" <chris dot b dot worley at intel dot com>
Date 2007-06-26 13:04:28 PDT
Message Thanks!

It looks like fsvs was exactly what I needed for my application!

>-----Original Message-----
>From: Philipp Marek [mailto:philipp at marek dot priv dot at]
>Sent: Tuesday, June 26, 2007 1:56 PM
>To: users at fsvs dot tigris dot org
>Cc: Worley, Chris B
>Subject: Re: Check-out, revert, and branch/merge strategies?
>
>On Dienstag, 26. Juni 2007 Worley, Chris B wrote:
>> I don't see an "fsvs co" documented, is "svn co" used?
>No.
>The way is simply
>1) set an URL
> fsvs urls file://// (or whatever)
>2) get the files
> fsvs up
>
>> The "fsvs revert" says it's not recursive, what would be a strategy
for
>> creating a list of all files changed since some revision that you'd
want
>> to revert to?
>You're right, the USAGE file is not updated.
>
>In the sources and the doxygen documentation that was changed for
1.1.14 IIRC;
>there's a "-R" switch for revert.
>
>> Are there any branch/merge capabilities?
>No.
>To do a branch you can simply do "svn cp" as usual, switch the URL with
"fsvs
>urls load", and work on the other url. (Maybe a "fsvs sync-repos" is
needed
>too, I didn't try that yet).
>
>
>Merging would be done via "svn" too -- although for system installation
(that
>means /bin, /sbin etc.) I wouldn't trust an merging algorithm :-)
>
>Whether that would make sense for binary files (/etc), is to be
discussed ...
>it would be possible to call an external merge program on update.
>(For diff FSVS does already a similar thing - gets the needed
revisions, and
>calls some external program.)
>
>
>What you can do is to "overlay" several URLs, so that the highest entry
is
>used; see test/021_multi_url_update, or ask me if it's not really
clear.
>
>
>Regards,
>
>Phil
>
>
>--
>Versioning your /etc, /home or even your whole installation?
> Try fsvs (fsvs.tigris.org)!
>
>----------------​--------------------​--------------------​-------------
>To unsubscribe, e-mail: users-unsubscribe@fs​vs.tigris.org
>For additional commands, e-mail: users-help at fsvs dot tigris dot org

« Previous message in topic | 3 of 6 | Next message in topic »

Messages

Show all messages in topic

Check-out, revert, and branch/merge strategies? "Worley, Chris B" <chris dot b dot worley at intel dot com> "Worley, Chris B" <chris dot b dot worley at intel dot com> 2007-06-26 10:22:38 PDT
     Re: Check-out, revert, and branch/merge strategies? pmarek P.Marek 2007-06-26 12:56:16 PDT
         RE: Re: Check-out, revert, and branch/merge strategies? "Worley, Chris B" <chris dot b dot worley at intel dot com> "Worley, Chris B" <chris dot b dot worley at intel dot com> 2007-06-26 13:04:28 PDT
             Re: Check-out, revert, and branch/merge strategies? pmarek P.Marek 2007-06-26 13:11:50 PDT
                 RE: Check-out, revert, and branch/merge strategies? "Worley, Chris B" <chris dot b dot worley at intel dot com> "Worley, Chris B" <chris dot b dot worley at intel dot com> 2007-06-26 13:19:20 PDT
                     Re: Check-out, revert, and branch/merge strategies? pmarek P.Marek 2007-06-26 13:21:07 PDT
Messages per page: