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

Re: Merging insanity

From: Adam Gibson <agibson_at_ptm.com>
Date: 2005-09-06 17:12:43 CEST

Ben Collins-Sussman wrote:
>
> Is all the fuss about trying to find the revision which is the 'base'
> of the branch? The whole running 'svn log --stop-on-copy' to figure
> out when the branch was created?
>
> Why not, when creating the branch, also make a tag of it:
>
> $ svn cp trunkURL branchURL
> $ svn cp branchURL branch-beginning-tag-URL
>
> [...make changes on branch...]
>
> $ svn checkout trunkURL; cd trunk
> $ svn merge branch-beginning-tag-URL branchURL

I never really understood why someone didn't think to program in a
CREATED revision name to make things more user-friendly for that use
instead of needing to create and delete tags.

svn merge -rCREATED:HEAD branchURL .

CREATED would be assigned to the newly created files/directories at the
time when the copy/move was performed.

I know it would make things easier for training other users around me
how to merge.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Sep 6 17:15:01 2005

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