[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-07 18:11:23 CEST

Dale R. Worley wrote:
> 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

I understand that not everyone uses a branch in the same way. Having a
CREATED tag name would not solve branching for everyone as it would
mainly help for the people who branch from trunk and keep only the
changes since the trunk copy on the branch(and make sure never to copy
the branch again during the branch life). I do not know the stats on
how many people use svn in that way but that is the norm for my uses.

Would the concern with implementing CREATED be that everyone might think
that would work for all branching methods and cause confusion?

One other feature to consider for CREATED is to implement a command line
  switch to 'copy' that would cause the CREATED revision name to not get
updated to the latest revision of the copy if a commandline switch was
passed --copy-created-time (ok that is a bad name but you get the idea).
  This would allow people working on a branch to copy it without setting
the CREATED on the files copied to the current revision. This might be
even more confusing for people not used to it though because they might
think CREATED always means when the last copy was done for that

Just having the CREATED feature itself would be a big time saver for
people who branch the way explained above. It just makes things easier
without compromising anything. People who branch differently just would
not use the CREATED revision name feature.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Sep 7 18:13:21 2005

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

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