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

RE: Creation revision of a branch

From: Vasilescu, Dan <Dan.Vasilescu_at_lmsintl.com>
Date: 2006-03-10 16:05:38 CET


It worked. I've tested --stop-on-copy before and I had the impression that returns the same as without it.
But I realize that I've tested on a directory created manually in which I've made a copy of another directory.
When I made the test directly on subdirectory I got different results.

The last scenario I've tried to explain is somehow like this.

I made a copy of a tree at revision 100. Inside this tree there is a folder which was not modified since version 50.
In the branch I've got the last modified rev from info which is smaller the branch creation. Trying to update the folder in the branch to revision 50 is not a good idea, it will disappear.

Best, Regards,
Dan Mircea Vasilescu
Software Development Engineer, Test Division
LMS International
Phone: +40 (268) 414 200
Fax: +40 (268) 414 232

-----Original Message-----
From: Paul Koning [mailto:pkoning@equallogic.com]
Sent: Friday, March 10, 2006 4:44 PM
To: Dan.Vasilescu@lmsintl.com
Cc: users@subversion.tigris.org
Subject: Re: Creation revision of a branch

>>>>> "Dan" == Dan Vasilescu <Vasilescu> writes:

 Dan> Can I get from somewhere the creation revision of a branch?

You mean the revision in which it was created? svn log --stop-on-copy.

Or the revision of what was copied to create the branch?
svn log --stop-on-copy -v will show the source path, including the

 Dan> It is possible to have branches created on from other branch.

Yes. Just copy from whatever you want to copy; that may be a branch.

If you do this, you need to be a bit more careful if you merge back to
the trunk. If you follow the documentation for "svn merge" you'll see
it mentions "svn log --stop-on-copy" to determine the branch creation
point, which you then use as the start revision number in the merge.
That is correct IF you're merging to whatever the branch was taken

But if you had branch B1, from trunk rev 100, and then you branch B1
at rev 150 to make branch B1_1, and then you want to merge from B1_1
back to trunk, you will want to merge starting at rev 100 -- NOT rev
150. Alternatively, of course, you may want to merge instead in two
steps: from B1_1 to B1 (starting at 150) and then the result from B1
to trunk (starting at 100).

 Dan> I want to make a revision tree and it would be helpful for me to
 Dan> know the order in which the branches were created.

 Dan> Or I want to see if I have files modified in the branch after
 Dan> the branch creation.

svn log --stop-on-copy will do that; the earliest rev it shows is the
branch creation rev, the others are branch changes. You issue that
command on the branch you want to examine.

 Dan> Or I want to get o folder from the branch at a previous revision
 Dan> and I want to be sure that the revision is after branch creation
 Dan> otherwise the folder will disappear.

I don't understand what you mean by that.

+-+-+- Email Confidentiality Footer +-+-+-
Privileged/Confidential Information may be contained in this message. If you are not the addressee indicated in this message (or responsible for delivery of the message to such person), you may not print, retain, copy nor disseminate this message or any part of it to anyone and you should notify the sender by reply email and destroy this message. Neglecting this clause could be a breach of confidence. Please advise immediately if you or your employer does not consent to Internet email for messages of this kind. Opinions, conclusions and other information in this message that are not related to the official business of my firm shall be understood as neither given nor endorsed by it.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Mar 10 16:07:02 2006

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