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

[TSVN] Cannot Merge changes made on branch

From: Cameron Tofer <camtofer_at_hotmail.com>
Date: 2005-03-22 18:59:44 CET

hi, i'm in a mess. this is what i did:

1) checked out trunk.
2) made a bunch of changes
3) realized that i should be working in a branch
4) made branch by using TortoiseSVN->branch/tag and added a comment (made
rev #1846)
5) to my horror i watched as all my temporary work and mess was committed to
the server automatically
6) switch to the new branch and made another change and commit
7) gave up on ever using branching and did a switch back to trunk
8) used TortoiseSVN->merge setting from to the branch and the rev to 1846.

from here merge will only update my second set of changes (#1847). not the
mess that was automatically committed for me(#1846). if i set the revision
to one less (#1845) it complains it can't find it.

will i ever understand branching/merging in subversion?!
-cam

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Mar 22 19:04:36 2005

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.