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

RE: FW: [TSVN] Bug TortoiseMerge? Changes seem to be allowed when diff'ing two revisions

From: Jochem Schulenklopper <jschulenklopper_at_hotmail.com>
Date: 2004-12-23 11:42:07 CET

Steve King wrote:
>Jochem Schulenklopper wrote:
>[...stuff deleted...]
> > Reproduction:
> > 1. Open the repository log
> > 2. Select a revision
> > -> list of modifications for that revision is shown in lower pane
> > 3. Select a modified file, and select "Show differences"
> > -> TortoiseMerge is launched, showing a file in that revision and the
> > previous revision
>It should show you a file in that revision compared against your working
>copy. Only if you chose "show differences as unified diff", then the
>diff between revision and revision-1 is shown.

Indeed, no problem so far, but the the crux of the matter was in step 4 and
5. It seems that you missed that point (but no offence intended). Since it
was deleted, I'm pasting that again with comments for clarity):

-------8<---snip, snip---8<------
4. When right-clicking on changes (either in left or right pane), it is
possible to select "Use text block from theirs" and other actions that
modify the right pane
   -> making modifications is allowed (comment: this is confusing)
   -> "Save" button is enabled
5. Press "Save"
   -> Saving seems to be allowed (comment: confusing / bug)
   -> No evidence has been found where saved file is stored (comment:

When diff'ing two historic revisions (instead of a file in some revision and
working copy file), making changes should either not be possible, or saving
should appear as "save as..." (select a file).
For clarity, the first option seems to be my preferred choice: otherwise the
suggestion is that the file in some (past) revision is changed
-------8<---snip, snip---8<------

Kind regards,

Jochem Schulenklopper

P.S. Last month, the company that I work for migrated from VSS to SVN+TSVN
for about 200 developers. Except for some repository layout changes
half-way, it has been a smooth introduction and implementation so far.
Excellent work, all! I was the internal Subversion-evangelist, so far it
hasn't backfired on me yet :-)

Play online games with your friends with MSN Messenger

To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Dec 23 11:50:22 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.