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

Re: Confused about how to merge changes from branch to trunk

From: Ben Fritz <fritzophrenic_at_gmail.com>
Date: Wed, 25 Sep 2013 14:56:30 -0500

On Wed, Sep 25, 2013 at 2:37 PM, Ian L <misc_at_imerk.com> wrote:
>> > Thanks for the reply.
>> >
>> > If i try doing merge a range of revisions FROM trunk and do not specify a
>> > range, it appears as though it wants to re-add every file in the project even
>> > though only 20ish files have changed.
>> How does it "appear" that way? It should only be merging stuff since your copy. It might say something about from r1 to HEAD, but it will only do what is needed.
> I did several test merges. In doing a test merge where i don't specify the range of revision, it's showing every file in the project as 'added'. it's also showing tree conflicts.

How did you create your branch, specifically?

If you did a "branch/tag" on your working copy root directory, or if
you copied the trunk directory in the repo browser to a branches
directory, then I would not expect to see any tree conflicts or
"added" files.

But if you created the branch piecemeal by copying individual files,
in SVN or in the Windows explorer, then I would expect to see a slew
of "added" files and tree conflicts.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-09-25 21:56:57 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.