New feature: add support for non-experienced users when committing merges

Hello,

I am in trouble with my developer team because I have difficulties in
getting them doing the things right when merging:
- sometimes the merge operation is triggered from a sub-folder instead
of root position (/trunk, /branches/X)
- when committing, the root directory with "svn:mergeinfo" property is
not included

I agree it happens because of lack of understanding of the underlying
mechanisms. By the way here is my proposal. It consists in checks,
warnings and proposed actions to help users to do the things right
when merging or committing a merge.

From the merge dialog:

- Raise a warning if the selected directory for the merge operation is
not the root directory of the working copy (generally speaking /trunk,
/branches/X) and propose to switch to root directory instead.

All the following descriptions concern the commit dialog.

- If the root directory of the working copy (/trunk, /branches/X) has
"svn:mergeinfo" property modified, raise a warning if the selected
directory for the commit is not the root directory and propose to
switch to root directory instead.

- When modified "svn:mergeinfo" are present, add a panel in the dialog
with the list of merged revisions.

- If the selected file list for commit does not contain folders with
"svn:mergeinfo" property, raise a warning, propose to include that
folders and alert about non-selected modified/added files that may
from merge operations.

If some users find all that checks too intrusive or inadequate with
their own repository structure, it may be a good idea to add
configuration entries to disable them selectively.

Even better but much more job: TSVN may keep details about each merge
operation applied on a working copy (modified/added/removed files) so
that it can alert the user more accurately when non-selected modified
files are not included in the commit. Definitely such information
should be included in Subversion working copy database itself.

Then a checkbox in front of the list of merged revisions displayed in
commit dialog may automatically select folders with modified
"svn:mergeinfo" properties and corresponding merged files.

What do you think about it ?

And of course, many many thanks for the great job done on TortoiseSVN !

--
Yves Martin
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2969533
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].