You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Thomas Neumann <tn...@users.sourceforge.net> on 2007/02/24 00:36:24 UTC

Nested/fine-grained Revisions?

Hi,

is it somehow possible to create more fine-grained (or conceptually
nested) revisions? More precisely, I want to perform one atomic commit
that creates more then one revision. This multiple revisions would then
probably have consecutive numbers and reflect one "aggregated" change to
the repository.

The reason I am interested something like this is the current merge
behavior. When merging changes from a branch back into the trunk, I
currently to a merge and a commit, which creates a single new revision,
containing all changes made in the branch. While conceptually correct,
this is not very informative when looking at the branch later on. I
would rather like to see multiple commits, just like on the branch, each
one encompassing changes of a limited scope.
As these changes might break the trunk in-between (some final cleanup
might be needed for the merge), I want these changes to be applied in
one atomic step, so just replaying commits is not an option.

Of course there are many difficulties when trying to merge branches as
sketched above, but before thinking of these I would like to know if
Subversion could even express the semantic I want. Or perhaps there is a
different solution to my problem?

Thomas

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Nested/fine-grained Revisions?

Posted by Matt Sickler <cr...@gmail.com>.
you could write a script to (or manually) apply the differences between
revision N and N + 1 - that would get you the same commits from the branch
applied to the trunk

svn doesnt do this by itself though so it wont be an atomic unit
the only atomic unit svn has in the commit / revision

On 2/23/07, Thomas Neumann <tn...@users.sourceforge.net> wrote:
>
> Hi,
>
> is it somehow possible to create more fine-grained (or conceptually
> nested) revisions? More precisely, I want to perform one atomic commit
> that creates more then one revision. This multiple revisions would then
> probably have consecutive numbers and reflect one "aggregated" change to
> the repository.
>
> The reason I am interested something like this is the current merge
> behavior. When merging changes from a branch back into the trunk, I
> currently to a merge and a commit, which creates a single new revision,
> containing all changes made in the branch. While conceptually correct,
> this is not very informative when looking at the branch later on. I
> would rather like to see multiple commits, just like on the branch, each
> one encompassing changes of a limited scope.
> As these changes might break the trunk in-between (some final cleanup
> might be needed for the merge), I want these changes to be applied in
> one atomic step, so just replaying commits is not an option.
>
> Of course there are many difficulties when trying to merge branches as
> sketched above, but before thinking of these I would like to know if
> Subversion could even express the semantic I want. Or perhaps there is a
> different solution to my problem?
>
> Thomas
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>