Hi,
I have the following use case;
I sometimes have a rewrite that I do in a seperate branch, which then lives
for some days. Since I really like relying on version-management, I record
my changes regularly. I just never push those changes, since they will
break the unit-tests.
This way of working means that if I make a mistake on a file, or simply make
a mess in my sourcefile, I can revert to the last recorded change without
problems. Really usefull.
When I finish working in my branch I then want to push all my changes to the
main branch. What has been bothering me, and others, is that this then
creates a flood of 10 to 15 patches, which are really only one patch from
the point of view of the main-branch.
I would like to be able to merge my patches when I push them to the main
branch. Any suggestions on how to do that? Should I file a wishlist item
on it?
I currently do this at 'push' time:
cd myBranch
rm -rf _darcs
cp -arf ../head/_darcs .
darcs add 'adds'
darcs record -am "rewrite foo"
darcs push
which is far from pretty and looses all sorts of info.
What about a 'meta-group-id' for branch-merges like these?
something like:
darcs push --coalesce -am "Rewrite foo"
which then creates one atomic-patch with all comments/patch times from the
seperate patches.
Anyone else think this would be usefull?
--
Thomas Zander
pgpG5YONZIyGE.pgp
Description: PGP signature
_______________________________________________
darcs-users mailing list
darcs-users@xxxxxxxxx
http://www.abridgegame.org/mailman/listinfo/darcs-users
|
