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

Re: TortoiseMerge Save discarding changes

From: Sven Brueggemann <SBrueggemann_at_gmx.net>
Date: 2006-05-11 01:11:34 CEST

Dan Climan wrote:
> 1) Can I use TortoiseMerge as a standalone app to compare (and merge
> changes) from two arbitrary local text files or does it only work when
> the two files are part of a Subversion repository?

You can use TortoiseMerge as a standalone diff tool by calling it
on the command line with /base:file1 /mine:file2 or by entering
two filenames in the initial dialog.
As you already discovered, the context menu provides basic merging
functionality - you'll have to see, if it satisfies your needs.
It's always the file on the right side ("mine") that is modified.

> 2) Can I make changes in merge local changes from one branch to
> another without committing them first. It seems from the Merge
> documentation below, for example, that if I wanted to make the
> same revisions to two branches I would have to make it in one
> then commit the changes before I was able to merge the chages
> into a different branch. I had been trying to put the same
> changes in trunk and branch before committing them in either
> place.

If you have a working copy for trunk and one for base it's possible
as described above, although it's uncommon to do this and I would
disencourage you to work this way (that's why I initially
misunderstood your question).

Are you trying to commit one change in branch and trunk together
in one transaction?

It's important to keep the branch and trunk in sync if you intend
to merge the branch back into trunk some time, so I strongly
recommend to use the recipies described in the Subversion book
and the TSVN help.

If you intentionally want to leave the common way, please give
an example why you want to do that.

Kind regards


To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Thu May 11 01:11:40 2006

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

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