can't merge with dffferent branches after upgrading to 3.01

after upgrading to 3.01. I found out that when i tried to merge from url, I
couldn't merge any changes like i did with ver 2.XX. any more.

I noticed there is a subtle difference in merge url screen. in version 2.XX,
there are two repository dropdowns allow you to select two different
branches along with a path or a revision for each one of them. However, in
ver 3.01, i found there is only one repository dropdown and two pathes and
two revisions selections.

I have tried different combination trying to get it to merge without
success.

that make me wonder if i did it right or there is a bug considering the
other repository dropdown is missing.

please let me know. thanks.
--
View this message in context: http://www.nabble.com/can%27t-merge-with-dffferent-branches-after-upgrading-to-3.01-tf4159801.html#a11835561
Sent from the SmartSVN mailing list archive at Nabble.com.

> I noticed there is a subtle difference in merge url screen. in version 2.XX,
> there are two repository dropdowns allow you to select two different
> branches along with a path or a revision for each one of them. However, in
> ver 3.01, i found there is only one repository dropdown and two pathes and
> two revisions selections.

Merging does only work with both sources being from the same repository.
Hence we have removed the second Profile selector. Please change the
path of your Profile to the parent of the branches you want to merge or
-- even better -- to the repository root.

--
Best regards,
Marc Strapetz
_____________
syntevo.com

gql wrote:
> after upgrading to 3.01. I found out that when i tried to merge from url, I
> couldn't merge any changes like i did with ver 2.XX. any more.
>
> I noticed there is a subtle difference in merge url screen. in version 2.XX,
> there are two repository dropdowns allow you to select two different
> branches along with a path or a revision for each one of them. However, in
> ver 3.01, i found there is only one repository dropdown and two pathes and
> two revisions selections.
>
> I have tried different combination trying to get it to merge without
> success.
>
> that make me wonder if i did it right or there is a bug considering the
> other repository dropdown is missing.
>
> please let me know. thanks.

SyntEvo Support wrote:
>
>>; I noticed there is a subtle difference in merge url screen. in version
>> 2.XX,
>> there are two repository dropdowns allow you to select two different
>> branches along with a path or a revision for each one of them. However,
>> in
>> ver 3.01, i found there is only one repository dropdown and two pathes
>> and
>> two revisions selections.
>
> Merging does only work with both sources being from the same repository.
> Hence we have removed the second Profile selector. Please change the
> path of your Profile to the parent of the branches you want to merge or
> -- even better -- to the repository root.
>
> --
> Best regards,
> Marc Strapetz
>
> thanks, moving the path up one level helps me to find the proper source to
> merge into. However, I find it a little inconvenient merging the file(
> especially when repository browser is slow and you will have go pick the
> file you want to compare couple of directories deep if you don't want to
> type the path manually) compared with the "old way" i set up the profiles
> and merge between branches/truck( all within the same repository, but
> different branches). and that is the main feature i like SmartSVN compared
> to TortoiseSVN. Merging is so easy that you just preset the profiles, and
> when it comes to merge, you just pick two relevant profiles( in the same
>; repository of course) and you don't have to navigate through the directory
> and you don't have to remember the path( example : trunk vs.
> Branches/Branches_XXXXX).
>
> I wonder in the future, can you guys have the second Profile selector back
>; and make the selectable choice to be the profiles created with the same
>; repository. I found it gives me 10X productivity when merging is a
> frequent thing to do daily by just creating a profile with meaningful name
>; and saving time to navigate the repository or type to complete the path(
> if you have the profile points to the root, you will have to type both
>; branches or truck to get a full path).
>
> thanks
>
>
>
>
> gql wrote:
>> after upgrading to 3.01. I found out that when i tried to merge from url,
>;> I
>> couldn't merge any changes like i did with ver 2.XX. any more.
>>
>>; I noticed there is a subtle difference in merge url screen. in version
>> 2.XX,
>> there are two repository dropdowns allow you to select two different
>> branches along with a path or a revision for each one of them. However,
>> in
>> ver 3.01, i found there is only one repository dropdown and two pathes
>> and
>> two revisions selections.
>>;
>>; I have tried different combination trying to get it to merge without
>> success.
>>
>>; that make me wonder if i did it right or there is a bug considering the
>> other repository dropdown is missing.
>>
>>; please let me know. thanks.
>
>
>
> Yahoo! Groups Links
>
>
>
>
>

--
View this message in context: http://www.nabble.com/can%27t-merge-with-dffferent-branches-after-upgrading-to-3.01-tf4159801.html#a12985208
Sent from the SmartSVN mailing list archive at Nabble.com.

> to TortoiseSVN. Merging is so easy that you just preset the profiles, and
> when it comes to merge, you just pick two relevant profiles( in the same
>; repository of course) and you don't have to navigate through the directory
> and you don't have to remember the path( example : trunk vs.
> Branches/Branches_XXXXX).

This kind of Repository Profile usage was not intended by us; when e.g.
authentication details change this would require all your Profiles to be
updated. Anyway, your use case is reasonable, so what would you think
about SmartSVN remembering the last x merge sources, similar as Relocate
currently does?

--
Best regards,
Marc Strapetz
_____________
syntevo.com

gql wrote:
>
>
> SyntEvo Support wrote:
>>> I noticed there is a subtle difference in merge url screen. in version
>>>; 2.XX,
>>> there are two repository dropdowns allow you to select two different
>>> branches along with a path or a revision for each one of them. However,
>>> in
>>> ver 3.01, i found there is only one repository dropdown and two pathes
>>> and
>>> two revisions selections.
>>; Merging does only work with both sources being from the same repository.
>>; Hence we have removed the second Profile selector. Please change the
>> path of your Profile to the parent of the branches you want to merge or
>> -- even better -- to the repository root.
>>
>> --
>> Best regards,
>> Marc Strapetz
>>
>> thanks, moving the path up one level helps me to find the proper source to
>> merge into. However, I find it a little inconvenient merging the file(
>> especially when repository browser is slow and you will have go pick the
>> file you want to compare couple of directories deep if you don't want to
>> type the path manually) compared with the "old way" i set up the profiles
>> and merge between branches/truck( all within the same repository, but
>> different branches). and that is the main feature i like SmartSVN compared
>> to TortoiseSVN. Merging is so easy that you just preset the profiles, and
>> when it comes to merge, you just pick two relevant profiles( in the same
>;> repository of course) and you don't have to navigate through the directory
>> and you don't have to remember the path( example : trunk vs.
>> Branches/Branches_XXXXX).
>>;
>>; I wonder in the future, can you guys have the second Profile selector back
>;> and make the selectable choice to be the profiles created with the same
>;> repository. I found it gives me 10X productivity when merging is a
>> frequent thing to do daily by just creating a profile with meaningful name
>;> and saving time to navigate the repository or type to complete the path(
>> if you have the profile points to the root, you will have to type both
>;> branches or truck to get a full path).
>>
>> thanks
>>
>>
>>
>>
>> gql wrote:
>>> after upgrading to 3.01. I found out that when i tried to merge from url,
>;>> I
>>> couldn't merge any changes like i did with ver 2.XX. any more.
>>>
>>> I noticed there is a subtle difference in merge url screen. in version
>>>; 2.XX,
>>> there are two repository dropdowns allow you to select two different
>>> branches along with a path or a revision for each one of them. However,
>>> in
>>> ver 3.01, i found there is only one repository dropdown and two pathes
>>> and
>>> two revisions selections.
>>;>
>;>> I have tried different combination trying to get it to merge without
>>>; success.
>>>
>>> that make me wonder if i did it right or there is a bug considering the
>>> other repository dropdown is missing.
>>>
>>> please let me know. thanks.
>>
>>
>>; Yahoo! Groups Links
>>
>>
>>
>>
>>
>

•  7
  New Members

SyntEvo Support wrote:
>
>
> This kind of Repository Profile usage was not intended by us; when e.g.
>; authentication details change this would require all your Profiles to be
> updated. Anyway, your use case is reasonable, so what would you think
> about SmartSVN remembering the last x merge sources, similar as Relocate
> currently does?
>
> --
> Best regards,
> Marc Strapetz
> _____________
> syntevo.com
>
> that is fair enough! that will make merging a lot easier! thanks a lot!
>;
>

--
View this message in context: http://www.nabble.com/can%27t-merge-with-dffferent-branches-after-upgrading-to-3.01-tf4159801.html#a13020774
Sent from the SmartSVN mailing list archive at Nabble.com.