[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: Dan Climan <dcliman_at_keepmedia.com>
Date: 2006-05-11 01:37:06 CEST

Sven Brueggemann <SBrueggemann@...> writes:
> > 2) Can I make changes in merge local changes from one branch to
> > another without committing them first.

> 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?
> If you intentionally want to leave the common way, please give
> an example why you want to do that.
> Kind regards
> Sven

I do separate commits for each branch or trunk. However, since I know that I
need this same change in both branches, I wanted to make the changes locally in
one branch then copy (ie merge) the changes to the other one. I would then do a
commit for each.


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:37:34 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.