You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by rjk1408 <ro...@gmail.com> on 2008/09/29 22:48:51 UTC
Re: Subversion 1.5 about reintegrate and renames
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?
Thanks!
Mark Phippard-3 wrote:
>
> On Thu, Jul 3, 2008 at 10:04 AM, rjk1408 <ro...@gmail.com> wrote:
>>
>> I read through your blog-post. You mention refactoring and effective
>> communication between team mates to make sure such problems don't crop
>> in.
>> Could you please explain what then would be a best known method or best
>> practices for merging AFTER a rename has taken place? For example, lets
>> say
>> 10 files on a branch have been renamed and committed in a single commit
>> transaction. If a merge from the branch to the trunk has to happen now,
>> how
>> would one go about fixing this problem? (I assume neither --reintegrate
>> nor
>> the 2-URL syntax are the way to solve this now)
>
> The current issue with reintegrate is just that some "error checking"
> it does is blocking the merge from running. When it does run, it is
> just a 2-URL merge. So they are the same thing.
>
> There is no Subversion merge (or update, or switch) option that
> follows a rename and merges the contents into the renamed file for
> you. I do not really know what your options are when you have done
> that. Perhaps a file by file merge on the renamed files? Basically
> the equivalent of create a patch with the changes in it, and apply it
> to the other file name.
>
> --
> Thanks
>
> Mark Phippard
> http://markphip.blogspot.com/
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>
>
--
View this message in context: http://www.nabble.com/Subversion-1.5-about-reintegrate-and-renames-tp18135802p19733224.html
Sent from the Subversion Users mailing list archive at Nabble.com.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Subversion 1.5 about reintegrate and renames
Posted by rjk1408 <ro...@gmail.com>.
I would also assume then, that using it will not necessarily break anything.
i.e if a user never synced up with the trunk, and did the following
cd trunk-working-copy
svn up
svn merge --reintegrate URL-TO-Branch .
It will produce the same effect as
cd trunk-working-copy
svn up
svn merge URL-TO-Branch .
I say this because, I tested out the two commands and found the
svn:mergeinfo to be the same in either case. This is not immediately
obvious, because when you run the first command, all it prints out is
--- Merging differences between repository URLs into '.':
Whereas, the second command actually prints out revision range :
--- Merging r5 through r20 into '.':
Examining the svn:mergeinfo in both cases shows
/branch/branch2:5-20
Hence, --reintegrate is as good as ignored in this case.
Mark Phippard-3 wrote:
>
> On Mon, Sep 29, 2008 at 6:48 PM, rjk1408 <ro...@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@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>
>
--
View this message in context: http://www.nabble.com/Subversion-1.5-about-reintegrate-and-renames-tp18135802p19743566.html
Sent from the Subversion Users mailing list archive at Nabble.com.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Subversion 1.5 about reintegrate and renames
Posted by Mark Phippard <ma...@gmail.com>.
On Mon, Sep 29, 2008 at 6:48 PM, rjk1408 <ro...@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@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org