Re: Subversion 1.5 about reintegrate and renames

On Mon, Sep 29, 2008 at 6:48 PM, rjk1408 <rohanjoseph_at_gmail.com> wrote:
>
> It seems from the subversion book, that reintegrate should be used only if
> one intends to periodically sync up with the trunk. Is this true? What If a
> user never intends to merge from the trunk into his branch but only wishes
> to put his changes back to the trunk? Does he need to use reintegrate at
> all?
>
> I tried this with a simple repository, and nothing broke, I kept making
> changes on my branch and kept pushing them to the trunk with the regular
> merge command i.e
>
> cd trunk-working-copy
> svn up
> svn merge URL-TO-BRANCH .
>
> If a branch never syncs up with the trunk, then does reintegrate need to be
> used at all?

No, it doesn't need to be used unless you have done a merge from trunk
to the branch. As long as you understand when you can and cannot use
the technique you are using, you are fine to do what you have been
doing.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org