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

RE: Feature Request: merge by drag

From: Gavin Lambert <colnet_at_mirality.co.nz>
Date: Sun, 6 Dec 2015 17:03:07 -0800 (PST)

On 5/12/2015 01:05, Ilya Nenashev wrote:
> Some times I'm working in a one branch in a one working copy and want merge commited changes into working copy of trunk or other branch.
> I very happy when by drag'n'drop by right mouse button I have "SVN Copy and rename versioned item here" command etc, but I will more happy, if there are will be also "Merge versioned item's changes" for files and folders!

That's not really a good idea.

Merges in SVN are intended to operate on entire revisions, whereas by dragging files around you are implying that you want it to operate on only those files that are dragged.

Even if this were possible, it would significantly mess up the revision-based merge tracking.

It could almost make sense if the folder being dragged is the root of the working copy, but the problem with this is that there'd be no way to specify the range of revisions that should be merged, and things get even more confusing if multiple folders were dropped.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3149879

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-12-07 02:03:15 CET

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.