On Fri, 10 Feb 2012 15:46:15 -0500 Leo Razoumov <slonik...@gmail.com> wrote:
> I am sorry if my language was not clear. Here are the diagrams:
I am sorry to jump in this thread...we might soon start working on our
application which is meant for niche market and therefore potential
contributors although experts in the field are probably not savvy with
DVCS tools, so Fossil is definitely unprecedented wiht its features and
simplicity to setup & use.
Otoh, we're familiar with DVCS tools (starting from darcs, bzr, mtn) and
now being hg user would like to not to lose any functionality from e.g.
hg. My question is connected with Mercurial's MQ feature...
> Then after some time trunk moves forward
>
> A----B----C----D----E-- <= trunk
> \-P1--P2--P3 <= my-patches
Let's assume I've the same situation like above, but consider that my
patches are too granular to commit each one to the trunk and would like
to eg. combine P1 & P3 together and then apply them as:
P2' --> P1_P3' to my trunk.
Is it possible to do it in Fossil?
Mercurial's MQ offers qfold command, and here is the help file for it:
[gour@atmarama gour] hg help qfold
hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH...
fold the named patches into the current patch
Patches must not yet be applied. Each patch will be successively applied
to the current patch in the order given. If all the patches apply
successfully, the current patch will be refreshed with the new cumulative
patch, and the folded patches will be deleted. With -k/--keep, the folded
patch files will not be removed afterwards.
The header for each folded patch will be concatenated with the current
patch header, separated by a line of "* * *".
Returns 0 on success.
options:
-e --edit edit patch header
-k --keep keep folded patch files
-m --message TEXT use text as commit message
-l --logfile FILE read commit message from file
use "hg -v help qfold" to show more info
Sincerely,
Gour
--
There are principles to regulate attachment and aversion pertaining to
the senses and their objects. One should not come under the control of
such attachment and aversion, because they are stumbling blocks on the
path of self-realization.
http://atmarama.net | Hlapicina (Croatia) | GPG: 52B5C810
signature.asc
Description: PGP signature
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
