> -----Original Message-----
> From: Karl Fogel [mailto:kfogel@newton.ch.collab.net]
> Sent: Friday, October 11, 2002 7:49 AM
> To: LOWE,DAVID (HP-Vancouver,ex1)
> Cc: dev@subversion.tigris.org
> Subject: Re: Adding changeset-like functionality to subversion
>
> "LOWE,DAVID (HP-Vancouver,ex1)" <dave.lowe@hp.com> writes:
> > On Thursday Jack decides he needs Jill's Wednesday
> changeset and applies it
> > to his file. My "order independent changeset" would give
> Jack these file
> > contents.
> >
> > main()
> > {
> > Func1();
> > Func2();
> > Func3();
> > WednesdaysFunc(); /* Wednesday's changeset */
> > Func4();
> > JacksFunc(); /* Jack's changeset */
> > Func5();
> > }
> >
> > Can I get that from subversion?
>
> As others have pointed out, yes, just run 'svn merge'.
>
> But, some problems we still need to solve:
>
> 1. The merge history should be recorded; that is, the system needs to
> be somehow aware that this particular changeset was applied to this
> file. This is something we've been discussing a lot anyway, I know
> Branko among others is itching for it (I am too!).
>
> IMHO, if we had to choose just one changeset-supporting improvement
> to start on right away, this would be it. It's almost the exact
> middle step between a CVS-like system and a BitKeeper-like system.
>
> 2. The example above is nicely formulated to avoid questions of change
> interdependence. Obviously, we'll have to handle harder cases as
> well. (I must admit I didn't really understand the answers posted
> so far about this problem, but I need to go back and read them
> again). David, have you read this document:
>
>
I have not but, I will.
There is also the problem of change removal, which has not been talked about
much. As I understand it , to remove a change you must, first of all, have
committed right after the merge. Then, assuming the commit created rev N,
you can back out that change by cloning rev N-1 and merging revs N+1:Head.
All of which is a bit cumbersome.
Dave
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Oct 11 19:49:32 2002