Select revision in dialogue

[Tom Walter-4]

When you use the merge wizard, and merge a range of revisions, if you go
to FROM and 'Select' and choose revision 1000, the TO revision is set to
1001 automatically. That isn't so bad if you only ever want to merge
single revisions, however if you then go to the TO revision, and use
'Select' to choose 2000, then the FROM is changed to 1999. This is a bit
annoying and means you have to open the select dialogue again, memorise
the revision, and then close the dialogue without choosing it, and type
in the memorised revision manually.

It would make sense to set the other revision automatically if no
revision has already been set. However if the other revision has already
been set, it shouldn't be modified.

Is this a bug report or a feature request?

Cheers
Tom

------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2411264

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].

[Mark Phippard-3]

On Mon, Oct 26, 2009 at 1:35 AM, Tom Walter <tom.walter@...> wrote:

> When you use the merge wizard, and merge a range of revisions, if you go
> to FROM and 'Select' and choose revision 1000, the TO revision is set to
> 1001 automatically. That isn't so bad if you only ever want to merge
> single revisions, however if you then go to the TO revision, and use
> 'Select' to choose 2000, then the FROM is changed to 1999. This is a bit
> annoying and means you have to open the select dialogue again, memorise
> the revision, and then close the dialogue without choosing it, and type
> in the memorised revision manually.
>
> It would make sense to set the other revision automatically if no
> revision has already been set. However if the other revision has already
> been set, it shouldn't be modified.
>
> Is this a bug report or a feature request?

I agree that does not seem right, feel free to enter a bug report.
That said here are a couple other comments:

1) The Select Dialog was meant to allow you to select a range.  So you
can shift-select that entire range and have both values filled in
automatically.

2) The Subclipse merge UI is old and largely outdated.  We have
replaced it with the CollabNet Merge client which is EPL licensed and
available from the Subclipse update site.  This is really the merge
functionality you ought to be using.

--
Thanks

Mark Phippard
http://markphip.blogspot.com/

------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2411365

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].

[Tom Walter-4]

Thanks Mark. I didn't know about the shift-select feature. That is great.

I am using the collabnet merge client, however this dialogue still appears when you choose the "merge two different trees" option.

Incidentally, even with the shift-select feature, one use case that this dialogue doesn't really cover is when you want to roll something back, ie merge from a later revision to an earlier one to remove some change. It always assumes that the earlier revision is the FROM and the later the TO. However that's a minor niggle and occurs rarely enough its no problem to just enter them manually in that case.

Thanks.

Mark Phippard wrote:

On Mon, Oct 26, 2009 at 1:35 AM, Tom Walter tom.walter@... wrote:
  

When you use the merge wizard, and merge a range of revisions, if you go
to FROM and 'Select' and choose revision 1000, the TO revision is set to
1001 automatically. That isn't so bad if you only ever want to merge
single revisions, however if you then go to the TO revision, and use
'Select' to choose 2000, then the FROM is changed to 1999. This is a bit
annoying and means you have to open the select dialogue again, memorise
the revision, and then close the dialogue without choosing it, and type
in the memorised revision manually.

It would make sense to set the other revision automatically if no
revision has already been set. However if the other revision has already
been set, it shouldn't be modified.

Is this a bug report or a feature request?
    

I agree that does not seem right, feel free to enter a bug report.
That said here are a couple other comments:

1) The Select Dialog was meant to allow you to select a range.  So you
can shift-select that entire range and have both values filled in
automatically.

2) The Subclipse merge UI is old and largely outdated.  We have
replaced it with the CollabNet Merge client which is EPL licensed and
available from the Subclipse update site.  This is really the merge
functionality you ought to be using.

  

[Mark Phippard-3]

On Mon, Oct 26, 2009 at 6:02 PM, Tom Walter <tom.walter@...> wrote:
> Thanks Mark. I didn't know about the shift-select feature. That is great.
>
> I am using the collabnet merge client, however this dialogue still appears
> when you choose the "merge two different trees" option.

Are you saying the problem exists when using that option?  It
shouldn't as in the merge two trees scenario the revisions are not
from the same tree.  If your server is on SVN 1.5+ it should be really
rare to even need to use that merge option.

> Incidentally, even with the shift-select feature, one use case that this
> dialogue doesn't really cover is when you want to roll something back, ie
> merge from a later revision to an earlier one to remove some change. It
> always assumes that the earlier revision is the FROM and the later the TO.
> However that's a minor niggle and occurs rarely enough its no problem to
> just enter them manually in that case.

We still choose to perform reverse merges from the History view.
Basically, you choose the revisions you want to back out from the
History view and take option to revert those revisions.

--
Thanks

Mark Phippard
http://markphip.blogspot.com/

------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2411545

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].

[Tom Walter-4]

Mark Phippard wrote:

On Mon, Oct 26, 2009 at 6:02 PM, Tom Walter tom.walter@... wrote:
  

Thanks Mark. I didn't know about the shift-select feature. That is great.

I am using the collabnet merge client, however this dialogue still appears
when you choose the "merge two different trees" option.
    

Are you saying the problem exists when using that option?  It
shouldn't as in the merge two trees scenario the revisions are not
from the same tree.  If your server is on SVN 1.5+ it should be really
rare to even need to use that merge option.
  

Yes it exists with that option. My server is not 1.5 so I was using this to revert a change, because I didn't realise about the revert feature in the history view. Which is also awesome. Thanks.

Incidentally, even with the shift-select feature, one use case that this
dialogue doesn't really cover is when you want to roll something back, ie
merge from a later revision to an earlier one to remove some change. It
always assumes that the earlier revision is the FROM and the later the TO.
However that's a minor niggle and occurs rarely enough its no problem to
just enter them manually in that case.
    

We still choose to perform reverse merges from the History view.
Basically, you choose the revisions you want to back out from the
History view and take option to revert those revisions.