Mark Phippard wrote:
> SteveKing <steveking@gmx.ch> wrote on 01/24/2005 02:07:17 PM:
>
>
>>So since some people don't want the revisions to merge entered (no
>>matter how it is dome) but the range specified the same way as the CL
>>client I've created another merge dialog.
>>To be honest, I've already committed that change. Even if it doesn't get
>
>
>>your ok, it's better than what we have now and we can always improve it
>>further if we ever get to an agreement on how it should look/work.
>>
>>So please comment on it. But don't get away with new features like
>>remembering which revisions were already merged, ... - those are
>>features Subversion will implement someday itself.
>
>
> I agree it will be an improvement. Thanks.
>
> In the text for "To:" you are missing the word "and" between URL and
> revision.
>
> I will respect your wish to not discuss remembering previous merges, but I
> do not completely agree that this is what Subversion means by merge
> tracking and that everything must wait until they implement it. That
> being said, I do agree that the end results would be the same or similar.
> In my view, that is all the more reason to implement something in the GUI
> tools.
>
> Mark
>
I would rise a word of warning about the possibility of tracking merge
remembering revision numbers.
What if the repo is loaded on an existing one ?
All revision numbers will be shifted while the comments/properties or
whatever still refer to "original" revision numbers.
Quite confusing I guess.
When I need to merge the trunk in a branch, I make a copy of the trunk,
at revision rx, with a meaningful name (e.g.
mergefrom_trunk_to_branch_X) then I get the revision of the trunk that
is the source of the copy for mergefrom_trunk_to_branch_X-1, say r1, and
merge the trunk from revision r1 to rx on the branch.
Obviously, a selective merge won't work.
I don't know if could be viable a solution that use a sort of "system"
directory to hold snapshots used to mark simbolically a repository revision.
Guido.
>
>
> _____________________________________________________________________________
> Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs.
> _____________________________________________________________________________
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Jan 25 10:28:07 2005