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

How to merge renamed files

From: Echlin, Jamie <jamie.echlin_at_credit-suisse.com>
Date: Thu, 10 Nov 2011 13:08:23 -0000

The other day I came across a feature of tortoise that I hadn't seen
before, iirc.

Which is that if you have two working copies off the same branch, one
person edits a file foo.c and commits, another user renames the same
file to bar.c and commits. As expected they are blocked from committing
because their WC is out of date, so they update and get a conflict.

The thing that I haven't seen before is that tortoise resolve shows a
button under "How do you want to resolve this conflict?" labelled "Merge
the changes into 'bar.c'". So this is great, this is normally exactly
what you'd want to do. My question here is *why can't this exact same
option be available when it is a conflict caused by a merge*? Ie, user1
edits foo.c on trunk, user2 renames the file on a branch. After merging
tortoise resolve just has two options, remove the file or keep the file,
neither of which is what one would want.

This causes a lot of pain here so I'm wondering if this will happen at
some point or there is some deep-seated reason why it cannot.

Cheers, jamie

Please access the attached hyperlink for an important electronic communications disclaimer:


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-11-10 14:27:51 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.