On Sunday 27 March 2005 11:32, Saulius Grazulis wrote:
> Now, I am a bit worried about my repositories since I use FSFS, but I am
> currently running Phil's text-time branch (r13350q), and we are very happy
> with this functionality and rely on it.
>
> Now, staying on this branch, I will obviously miss your fix which I, ehh,
> would not like.
>
> Is there a chance that meta-data-versioning gets merged into the trunk, or
> do I need to merge it into my copy? The problem with merging is that it
> starts generating conflicts that need to be fixed manually, an the more the
> trunk changes, the more conflicts will emerge...
>
> I guess meta-data-versioning is quite usefull to many, and seems pretty
> stable at the moment.
>
> How should one proceed in such case?
You could do this:
- cd into your trunk/
- call
svn merge --dry-run http://svn.collab.net/repos/svn/branches/meta-data-versioning/text-time/ -r 13255:HEAD .
(or whatever your access method is), and verify that no error happened.
Then call the same without --dry-run, and you'll have the newest
text-time-versioning with the newest trunk!
Hope that helps!
Regards,
Phil
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Mar 30 07:48:44 2005