[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[TSVN] RE: a separate mail

From: Leonard Ritter <leonard.ritter_at_steganos.com>
Date: 2005-07-12 18:48:28 CEST

> And the rest of the paragraph says:

i swear it wasnt there the last time i looked! ;)

>>What you would like, and what everyone would like, is merge tracking.
>>That is on the subversion roadmap, but it is some way off yet.
>
> no, actually i really would like what i stated before. so does my
coworker.
> why did you change the behaviour anyway?

> Because lots of people were getting confused by the fact that you have to
subtract 1 from the first revision you want to merge. It is proving hard to
please everyone :-(

true. so what about something like the following option as a set of radio
buttons in the option dialog:

When selecting a log entry for merging, it means

[ ] select that revision
[X] select the previous revision (-1)
[ ] select the next revision (+1)

could also be a three-stage slider or a numeric field with an up/down-box.
you could even make it a registry setting, as long as it can be changed ;)

so my choice would be the 3rd, where the current default is the 2nd. my
co-worker and i, we felt comfortable with selecting the last merge log
entry, because we usually merge between branch creations and merges only.

additionally, a possibility to select the revision from the current branches
log would also be neat (a second "show local log" button?), since this is
what we need most of the time. we often have branches that evolve in
parallel, where both branches will not be merged back into the trunk for a
long time. as e.g. branch A grows and branch B currently doesnt, we
repeatedly merge branch A into branch B, committing with log entries such as
"merged branch A into branch B". those log entries are of course associated
with branch B. when we merge A into B the next time, we cant use the "show
log" button, since it displays the log of branch A. i usually hack around
this by first selecting branch B into the combobox, using the log selection
to pick the revision i last merged and then change the combobox back to
branch A.

funny enough, this way of doing this also created this big problem of a
missing revision when you changed the way of log revision selection for
merging. before, i would directly select the last merge log entry from
branch B, and it would take that revision+1. after, and also because i didnt
fully realize the implications your change had, i mistakenly selected the
next bar, assuming this would work like it did before. but the next log
entry was of course for branch B, not for branch A.

and right now i'm getting a great idea. what about scrapping the whole
"option" idea above and just add a second "show local log" button where it
would display the log of my local branch and, opposed to the remote branch
log, take the revision i select and add 1 to it like it did before?

we are doing this manually now, the show log feature cant be used like it
is, currently.

> grrrr. why is this checkbox checked for the merge "show log" command
> by default then?

>Because if you are looking at a branch, it is natural to want the log to
stop at the branch creation point. Unfortunately, that's not the only place
it can stop. Subversion will do true renames sometime soon ...

good. i can live with that answer :)

you're all doing exceptional work by the way. tsvn is fun to work with. i
convinced my boss to use svn/tsvn on the workplace after we used it for an
open source project that me and a friend were working on in my spare time.
now i wish i had that kind of integration for kde ;)

best regards,

leonard

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Jul 12 18:47:15 2005

This is an archived mail posted to the TortoiseSVN Dev mailing list.