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

Re: [TSVN] Re: TortoiseSVN 1.2.1.3895 - Merge "From" Revision Selection Bug

From: Simon Large <simon_at_skirridsystems.co.uk>
Date: 2005-07-25 19:31:51 CEST

Udo Schifferdecker wrote:
> I have to disagree with Rainer here:
> When selecting a range (like rev 5 to 8 in the above example) the
> "From:" revision should
> be set exactly to that value selected in the "Show Log" dialog (rev 5 in
> this case).
> The online help already tells the user already to select the rev BEFORE
> the change. If you do as told
> you end up one rev lower than you wanted, which is annoying.

When did you last read the help file?

<quote>
If you now want to merge all the changes from MyBranch into the trunk
you have to choose 36 as the From Revision, not 37 as you might think.
If you select revision 37 as the start point, then the difference engine
compares the end point with revision 37, and will miss the changes made
in revision 37 itself. If that sounds complicated, don't worry, there is
an easier way in TortoiseSVN ...

The easiest way to select the range of revisions you need is to click on
Show Log, as this will list recent changes with their log comments. If
you want to merge the changes from a single revision, just select that
revision. If you want to merge changes from several revisions, then
select that range (using the usual Shift-modifier). Click on OK and the
revision numbers of the From revision and To revision in the Merge
dialog will both be filled in for you.
</quote>

> In the above example you even get an error message, because in rev 4 the
> branch is not even existing!

The help file tells you to select the revisions you want to merge. You
don't want to merge branch creation into the trunk.

> Or think of the follwing example:
>
> 10 Modified branch
> 9 Removed something in branch
> 8 Added that in branch
> 7 More changes in trunk
> 6 Changes in trunk
> 5 Created "my_branch" branch from trunk on repos
>
> To merge all changes made in the branch to the trunk you have to select
> revs 10 and 8 in the
> "Show Log:" dialog ending up with "From:" = 7 and "To:" = 10 in the
> Merge dialog.
> This is much less intuitive than selecting revs 10 and 5!

OK, continue this line of thought to the next time you want to merge:

15 Added file to branch
14 More changes in branch
13 Changed trunk
12 Changed branch
11 Merged r8-10 into trunk
10 Modified branch

Now you want to select the revisions to merge.
Show log for the branch and select the revisions to merge, r12-15.
Using your method we would have to select r10-15, and people would ask
'why am I merging r10 again; I already did that last time'.

Whichever way you choose to implement it, someone will find it
confusing, and many people *did* find it confusing before.

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 Mon Jul 25 19:31:25 2005

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