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

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

From: Jochem Schulenklopper <jschulenklopper_at_hotmail.com>
Date: 2004-12-15 11:50:45 CET


using TortoiseMerge 1.1.1 (build 1857) I noticed the following. Either my
understanding is wrong (let that be a likely possibility), or it is a minor
but confusing defect.

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
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
   -> "Save" button is enabled
5. Press "Save"
   -> Saving seems to be allowed (and sometimes I've noticed a program hang
at this stage)
   -> No evidence has been found where saved file is stored (but I guess it
isn't anywhere)

When diff'ing two revisions (instead of a file in some revision and a
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 --instead of
via the working copy file.

Kind regards, thank you all for a great product and excellent community


MSN Search, for accurate results! http://search.msn.nl

To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Dec 15 11:58:27 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.