|Re: merge behaviour [message #40261 is a reply to message #40237]
||Wed, 14 January 2009 16:24
| Igor Burilo
Registered: July 2009
We already have discussions about svn 1.5 merge-tracking in mailing list.
Please see below a snippet from it:
The fact is that earlier we have just asked SVN for merge preview and built
the preview in the merge view, so that the user could decide what changes
does he want to accept and what he does not. But now it is impossible cause
we simply do not want to do SVN job of calculating and setting
merge-tracking properties, cause it is totally SCM to do that, and if we
make some failure by calculating this manually, everithing can break in your
project structure history.
It's really a pity, but it is true, that now only the merge conflicts and
skipped files are shown in the merge view.
>I switched to Subversive mainly because of its enhanced merge support.
>Subclipse at the time just wasn't good enough. Subversive offered above all
>other things an interface I understood intuitively.
> Since Subversive has been modified for svn 1.5 the whole merge behaviour
> has changed. One thing I really liked is the ability to choose what
> changes I wanted, apply that to my working copy and then commit to trunk.
> Subversive now no longer does that but forces all changes onto your
> working copy and then you choose what to put in the trunk.
> This is not only undesirable behaviour but it's also dangerous (if you
> ignore the posiblity of a revert anyway). I prefer to commit things I know
> work. We have a release branch which gets changes which may or may not
> need to be migrated to the trunk.
> I have currently reverted to using the command-line interface. At least it
> does exactly what I tell it to, if not always what I want.
> If any more work is done on subversive I think many people would
> appreciate more work on the merge interface. I would guess that merging is
> the number one problem in subversion and anything that makes that easier
> will be used.
Powered by FUDForum
. Page generated in 0.07315 seconds