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

Re: Merger not Merging -- What I would like a merge process to do.

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-01-24 15:46:09 CET

On Jan 24, 2005, at 1:25 AM, matthew ford wrote:

> Thanks again for your detailed response.
> I think I at last understand the merge process.
>
> Looking over my requirments again, I now think that I am asking for
> features at a file level that do not exist at the line level.
> If a line (or whole method) is deleted, the merge will just delete it
> The merge will not mark it as conflicted and ask you to confirm you
> want to
> delete it.
> It not unreasonable to apply the same process to a file.

Yes, it's the same process, whether we're talking about lines of code
or files in a tree. If one branch ignores something, and another
branch deletes something, then there's no conflict of intent. The
"merge" of the two branches simply has the thing missing. The only
time you get a conflict when merging is:

     * both branches change the same part of a file
     * both branches add a new file or directory of the same name
     * one branch changes a file or dir, and the other branch deletes it

>
> (Having said this some sort of gui display of what the merge is going
> to do
> would be good.)

The commandline program has no GUI. But 'svn merge --dry-run' will
give you a preview of a merge. So will 'svn diff -rX:Y URL'. (And
remember, a merge just produces temporary changes that can be reverted
from a working copy; it's not official until you 'svn commit'.)

I know that TortoiseSVN ships with a graphical diff program, which can
then be used to preview merges.

>
> I look forward to your smart merge features.
>
> thanks again for your patience.
>
> p.s. Could you add patch to svn for completeness as it is needed for
> applying diffs
> and does not come standard on Windows.
>

Why would you need to run the 'patch' program to use Subversion on
windows?

TortoiseSVN ships with a patch program, I believe. But that's not
because one needs it to use Subversion. It simply allows a windows
user to apply patches grabbed from email lists -- it generally aids in
collaboration. But I think it's out of Subversion's scope to
internally add such a generic thing.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Jan 24 15:48:42 2005

This is an archived mail posted to the Subversion Users mailing list.