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

RE: Working with a deleted branch

From: Brummer, Byron <ByronBrummer_at_LiveNation.com>
Date: 2007-05-17 00:27:40 CEST

SVN has a concept of "PEG revisions" that are completely distinct from
the actual revisions (well no, but far enough). If you ever delete or
rename anything in SVN PEG versions will drive you bonkers. SVN just
does not have any sane interfaces for working with deleted revisions.

try:
        svn merge -r 799:999 svn://myserver/myproject/branches/1_at_999

Note the @999 on the end..that needs to be a rev in which the revs
you're asking for actually existed.

-Byron

> -----Original Message-----
> From: Nic Daniau [mailto:Nic.Daniau@Xchanging.com]
> Sent: Wednesday, May 16, 2007 7:04 AM
> To: users@subversion.tigris.org
> Subject: Working with a deleted branch
>
> Hi,
>
> Context:
> - I've got two branches on my project, branches/1 and branches/2.
> - At revision 1000 I've deleted branches/1
> - Time has passed and the HEAD revision is now 1200
>
> Problem:
> What I'm trying to do is a merge from revisions 799:999 of branches/1
> onto the current HEAD of branches/2. I wouldn't have thought this
could
> be a problem, as I'm not interested in the fact that revision 800
> "deleted" branches/1, I'm only interested in the diff between 799:999
on
> that branch; but in fact it appears to puzzle Subversion completely!
>
> Tests:
> I get this:
> C:\myproject>svn merge svn://myserver/myproject/branches/1 -r
799:999
> svn: File not found: revision 1200, path '/branches/1'
> I also get the same output by the way when I do:
> C:\myproject>svn ls svn://myserver/myproject/branches/1 -r 799
> or
> C:\myproject>svn log svn://myserver/myproject/branches/1 -r 799
>
> Question:
> Why does it insist on the branch still being around at the HEAD
revision
> when I ask it what happened at a specific revison and path in the
past?
> Is this a limtation of Subversion or is there a way round or am I
simply
> missing the point?
>
> Thanks in advance for your enlighting comments!
>
> Nic
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu May 17 00:30:29 2007

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