On Fri, Feb 10, 2012 at 15:28, Richard Hipp <d...@sqlite.org> wrote:
> On Fri, Feb 10, 2012 at 3:19 PM, Leo Razoumov <slonik...@gmail.com> wrote:
>>
>> I guess at some point with every SCM system one faces a challenge of
>> a patch based workflow. I need to maintain a set of patches on a
>> branch which are periodically reapplied as trunk moves forward.
>
> If you apply a patch once, it is on that branch. To "reapply" a patch would
> be a no-op, since the changes are already present on the branch, unless for
> some reason you had backed the patch out since the prior application.
> Perhaps I don't understand what you are asking for?
>
I am sorry if my language was not clear. Here are the diagrams:
I start "my-patches" branch from trunk commit B and organize my
changes as a set of patches
each one addressing specific issue.
A----B-- <= trunk
\-P1--P2--P3 <= my-patches
Then after some time trunk moves forward
A----B----C----D----E-- <= trunk
\-P1--P2--P3 <= my-patches
Now I want to reapply (I am avoiding word "rebase") my patches P1 through P3
to the trunk commit E to achieve something like this
/-P1'--P2'--P3' <= my-patches
A----B----C----D----E-- <= trunk
\-P1--P2--P3 <= closed
I am effectively rebasing my patches to the new trunk commit and I
will close the leaf on the old branch.
If I use merge then all three patches will be squashed into a single
change-set. I would rather prefer to keep them as individual patches.
--Leo--
_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
