Jody Shumaker <jody.shumaker@...> writes:
>
> On 5/10/06, Sven Brueggemann <SBrueggemann@...> wrote:
> > Dan Climan wrote:
> >
> > > I had some changes in the trunk version of a file that I was trying to
> > > apply to a branch, but the changes keep getting discarded.
> >
> > What do you mean with "discarded"? Do you get a conflict?
>
> I think what he means is that he wants to merge changes done on the
> trunk to his branch. Yet he's running the App TortoiseMerge and
> opening files.
>
> >
> > > I open TortoiseMerge and put the full path to the trunk version
> > > in Base File and put the path to the branch version in My File since
> > > this is the one I want to change.
> >
> Dan, if you want to merge changes from the trunk to your branch, the
> correct thing to do would be to select the TortoiseSVN->Merge menu in
> explorer for the file/folder you want to merge. You don't want to run
> the TortoiseMerge app and open the files. TortoiseMerge app is
> specifically for hand-merging when you have conflicts. Please read the
> help on merging:
>
> http://tortoisesvn.sourceforge.net/docs/release/TortoiseSVN_en/ch05s17.html
>
> - Jody
>
Thanks, this is what I meant and thanks for the reference. This addresses my
immediate question.
However, it brings up followup questions.
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?
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.
Dan
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Thu May 11 00:24:15 2006