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

Re: [TSVN] Merge dialog (was: a separate mail)

From: Simon Large <simon_at_skirridsystems.co.uk>
Date: 2005-07-12 19:15:46 CEST

Leonard Ritter wrote:
> 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.

There is already a Show Log button for the working copy branch. It is in
the 3rd groupbox. At the moment, selecting a revision here doesn't do
anything.

> 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.

I think you are mistaken in using revision+1. You run the risk of losing
the change immediately after that revision. SVN is taking a diff between
the start and end points and applying to your WC. So the start point has
to be immediately *before* the changes you want to merge (that's why we
need to do r-1 a lot of the time). Read the TSVN and subversion manuals
for more explanation of this.

There may be a way to do what you want, but the difficulty always is
making it intuitive to use. I will think about that a bit further.

Simon

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Jul 12 19:15:13 2005

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