[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: Dale R. Worley <dworley_at_pingtel.com>
Date: 2005-09-06 23:22:31 CEST

On Tue, 2005-09-06 at 14:15 -0700, Ian Eure wrote:
> > 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.
> >
> Precisely. This would alleviate my biggest problem with SVN's branch/
> merge operations. I think that requiring a revision lookup or tag to
> merge changes is difficult and stupid.

It's not as easy as it looks, because a "branch" is only an idea in the
users' heads, not a feature of the Subversion repository. There is no
uniquely defined "created" revision if you assemble a new subtree out of
copies from various different revs and locations in the repository.

Can you come up with a clean, sensible definition of "CREATED" that does
what you want?

Dale

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Sep 6 23:24:03 2005

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