Toby Johnson wrote:
> I have a use-case scenario that isn't working as I expected and I
> don't know whether it's by design, or just something that hasn't come
> up yet...
>
> We were developing on trunk, Branch A, and Branch B. We finished
> Branch A, merged the changes back to trunk and to Branch B, and
> deleted Branch A.
>
> Now, I want to merge Branch B back to trunk, except I obviously don't
> want to re-merge those revisions in Branch B which were merges from
> Branch A, since those changes are already reflected in trunk. So, I
> opened up the "Show Log" dialog from the Merge dialog, and selected
> all revisions in Branch B (P.S... is there a "Select All" somewhere
> I'm missing?)
>
> But now I need to un-select the Branch-A-merge-revisions, so I typed
> "merge" into the search box, and held down CTRL while un-selecting the
> unwanted revisions. But when I then cleared to search box to show all
> revisions, all the previously-selected revisions are now gone.
>
> Also, if I type a search term into the search box (without previously
> selecting anything), then select some revisions, then clear the search
> box, then some revisions are still selected, but they aren't the same
> ones I chose. It's like it's using just an index-based selection
> array, but those indexes change when the search box is cleared and the
> array isn't updated. If it's not possible to maintain the selection
> after clearing the search box, I'd expect that it at least un-selects
> everything so as not to give that impression...
OK, sorry about the brain fart, of course it's not possible to
cherry-pick revisions when doing a merge using the svn library. However,
the last paragraph about the revision range not being maintained after
clearing the search box is still valid I think.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Mar 21 17:01:30 2006