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

Re: confused about merging

From: Clemens A Mensik <clemens.mensik_at_ip2.at>
Date: 2005-09-29 14:24:26 CEST

Hi Martin,

> I've read the chapter on merging in the subversion book and I can't seem
> to quite correlate that to my particular situation. I have my trunk in
> src/project. From time to time I want to tag a release, which is found
> in src/<version number>, so
>
> src/project
> src/1.0.0
> src/1.0.1

why don't you create a folder for all your "tags" like /src/tags/1.0.0 ...
after a while your /src directory will get crowded creating tags directly
in /src...

anyway, back to your problem...

> etc.
>
> Now, if I make a release 1.0.1 and I forget to make some changes to it
> before I tag it (for instance neglecting to update the INSTALL file), I
> make those changes in src/project and I want to sync them to src/1.0.1.
> How can I do that?

it's pretty simple if you've understood the way svn merges...
it use your specified delta and tries to merge it into your target.
lets take a look at your case...

(1) project (revision 20)
(2) create your tag (1.0.1, revision 21)
(3) do some changes in project (revision 22)
(4) other changes in project (revision 23)

now you'd like to merge all the changes you did after you've created
the tag.

target (merg to)! directory is your tag (1.0.1)... now if you're asked
about to specify from and to directory and revision you have to
specify "src/project (revision 20)" as your from and "src/project
(revision 23)" as your to...

now, your svn client (subversion, tortoise, whatever you use...) tries to
merge all those changes you did to project after revision 20 till 23 into
your specified target (tag)...

got it? ;-)

greets
clemens

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Sep 29 14:53:58 2005

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