Merge changed between in 0.7.2 ? [message #31537] |
Wed, 13 August 2008 07:45 |
Eclipse User |
|
|
|
Originally posted by: stefan.risto.novosec.com
Hi,
up to 0.7.1 (Ganymede) was done interactively, e.g. changes between
revisions were displayed as incoming changes.
Now with 0.7.2 the differences are immedately applied to the workspace
copy and the synchronize dialog displays the (already applied) changes
as outgoing changes.
I really liked that feature since it allows for very fine grained change
selection.
Can anyone confirm this? Or is there just a checkbox to be checked again?
Thx for your help,
Stefan
|
|
|
Re: Merge changed between in 0.7.2 ? [message #31645 is a reply to message #31537] |
Wed, 13 August 2008 08:11 |
Eclipse User |
|
|
|
Originally posted by: alexander.gurov.polarion.org
Hello Stefan,
I confirm that merge UI behaviour is changed with 0.7.2. Though preview of
merge changes works fine with SVN 1.4 it will not work correctly with SVN
1.5 merge tracking feature. Regarding to high importance of merge tracking
we've changed merge UI behaviour in order to support merge tracking
functionality. Now merge UI first performs merge operation then it shows
which changes are made as outgoing changes and skipped changes as incoming
changes. Then you can accept or decline changes which are made by the
merge operation.
Stefan Risto wrote:
> Hi,
> up to 0.7.1 (Ganymede) was done interactively, e.g. changes between
> revisions were displayed as incoming changes.
> Now with 0.7.2 the differences are immedately applied to the workspace
> copy and the synchronize dialog displays the (already applied) changes
> as outgoing changes.
> I really liked that feature since it allows for very fine grained change
> selection.
> Can anyone confirm this? Or is there just a checkbox to be checked again?
> Thx for your help,
> Stefan
|
|
|
Re: Merge changed between in 0.7.2 ? [message #31715 is a reply to message #31645] |
Wed, 13 August 2008 08:59 |
Eclipse User |
|
|
|
Originally posted by: Stefan.risto.novosec.com
Alexander,
the former merge operation allowed for selection of some changes in a
single file, so I didn't have to accept all the changes in a file, but
only some.
If I want to achieve the same using the new version I have to copy and
paste the changes manually. The advantage of allpying only selected
changes in a single file is totally gone.
This was a key feature for us when we selected the subversion plugin to be
used in our projects.
I hope you will find a way to support the old behaviour; I am pretty sure
others will miss that as well.
Regards, Stefan
|
|
|
Re: Merge changed between in 0.7.2 ? [message #31743 is a reply to message #31715] |
Wed, 13 August 2008 10:08 |
Eclipse User |
|
|
|
Originally posted by: joerg.von.frantzius.artnology.com
Stefan Risto wrote:
> Alexander,
>
> the former merge operation allowed for selection of some changes in a
> single file, so I didn't have to accept all the changes in a file, but
> only some.
>
> If I want to achieve the same using the new version I have to copy and
> paste the changes manually. The advantage of allpying only selected
> changes in a single file is totally gone.
>
> This was a key feature for us when we selected the subversion plugin
> to be used in our projects.
>
> I hope you will find a way to support the old behaviour; I am pretty
> sure others will miss that as well.
Absolutely!
|
|
|
|
Powered by
FUDForum. Page generated in 0.02528 seconds