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

Re: Subversion Questions/Defects

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2003-05-02 21:02:51 CEST

"Mark Watts" <mwatts3@stny.rr.com> writes:

> * I have had problems doing a revert (svn revert) on a directory after
> having added sub-directories and files (svn add).

You will have to provide a more complete description here. (Perhaps
you just need to use --recursive?)

> * I work on the windows platform and so far have been running Subversion
> locally. Having to move back to the drive the repository is not because svn
> does not understand file:// commands issued for a repository not on the
> current drive is a bit of a pain. Is this going to be addressed by 1.0?
> Please understand this is not a huge issue, just a question.

I don't use Windows, but I thought this worked. Please show the
command you typed and the error message it produced.

> * I just don't get how to merge changes made on the trunk into a 'branch'
> used as a private workspace. It may have been I come from the PVCS world
> and frankly to put it nicely I find it one of, if not the most, frustrating
> pieces of software I have ever had the opportunity to use. However, coming
> from that background also limits my experience's with some of Subversions
> more sophisticated features. I have read the Subversion book and have spent
> some time using it on a test repository but I still find the explanation of
> it lacking and I am sorry that I can't be more clear than that. Perhaps an
> example:
> -trunk check in at revision 7
> -branch to create private workspace. This creates revision 8
> - work continues on the trunk while I am doing lots of work in private
> workspace. Repository revision is now at 25
> -I decide that I need to merge in the changes from the trunk.

I suggest you use 'svn merge -rX:Y TRUNK_URL wc_path'. In principle,
running the command 'svn diff -rX:Y SOME_URL' will show you the
changes that merge will incorporate.

> Now do I
> specify revision 7 from pre branch or 8 where the branch was
> created?

It doesn't matter, TRUNK_URL at revision 7 is the same as TRUNK_URL at
revision 8, try 'svn diff -r7:8 TRUNK_URL'.

> And
> what if I know that I only want to merge in the changes from revision 9 -12
> and 14-17.

svn merge -r9:12 TRUNK_URL wc_path
svn merge -r14:17 TRUNK_URL wc_path
svn commit wc_path

Perhaps with an 'svn commit' in between the two merges if you want to
record them separately.

> Revision 13 was a trunk change that I just don't want at this
> time and I also don't want other trunk changes after revision 17. And how
> do I merge changes from another branch into my branch, so I can pickup SOME
> of the work my co-worker.

svn merge -rX:Y OTHER_BRANCH_URL wc_path
svn commit wc_path

Philip Martin
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri May 2 21:03:48 2003

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

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