On 24/7/02 9:02 PM, "cmpilato@collab.net" <cmpilato@collab.net> wrote:
> Peter Schuller <peter.schuller@infidyne.com> writes:
>
>> Hmm. I think I just realized what it really is that I am looking for. I
>> want to be able to commit *a set of changes*. That is, I want to be able
>> to create a set of logical commits/diffs in the repository separately
>> from the main tree. I want to be able to work against this "scratch"
>> version of the repository. Sort of like views for tables in relational
>> databases, except in this case it's a view of the repository.
>
> What you are describing is exactly what the "branch" concept means.
Hmm. I got one thing more out of his post. I'm not sure if this is what he
meant, but...
When you merge, you compress the log messages of the individual commits into
a single log message: "merging branch foo, revisions bar through baz". It
would be nice if 'svn log' could pull this information back out for you.
In the post-1.0 feature set is the concept of storing in properties what
gets merged where. It might be interesting if 'svn log -v' parsed these
properties, retrieved the appropriate log messages, and output them too.
E.g:
svn commit -m '* Did originial stuff' (rev 1)
svn copy -m 'make experimental branch' \
http//.../trunk http://.../branches/experimental
(rev 2)
... remember the revision number we just created here as REV ...
svn switch http://.../branches/experimental
... do various stuff, commit changes, etc:
svn commit -m '* Did something' (rev 3)
... Someone else commits to the head making rev 4
svn commit -m '* Did something else' (rev 5)
... decide to commit to the main view:
svn switch http://.../trunk
svn merge -r REV:HEAD http://.../branches/experimental
svn commit -m '* Merging in experimental changes' (rev 6)
... Do more stuff
svn commit -m '* Did another something' (rev 7)
Then: (and I've forgotten the correct format)
svn log -v
----------
Rev 7: * Did another something
----------
Rev 6: * Merging in experimental changes
Merged logs (revs 2 through 5):
----------
Rev 5: * Did something else
----------
Rev 3: * Did something
----------
Rev 2: make experimental branch
----------
Rev 4: * Some stuff done by your friend
----------
Rev 1: * Did originial stuff
Later,
\x/ill :-}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jul 25 04:21:16 2002