Hi
Lately I have the following workflow.
In my repo I have two (named) branches:
Uwe: which contains the experimental stuff
default: the main line
So from time to time when I am satisfied I merge the commits from Uwe to
default and I push.
So far so good.
But the following occurred. When working in the Uwe Branch
I found a quick fix for a problem. But now my files contain two set of changes.
- the not finished ones
- and the fix
So I could commit and then merge into default, but this way I also merge
in the unwanted premature stuff.
I could use the record extension instead of committing but then if I only
pick the line containing the fix I lose the non finished one.
I thought of using shelve but that does not solve the problem neither
really.
Others mention the graft extension but I failed to see its benefits.
The only solution seems to shelve, to add again the fix lines, to commit
to merge, to go back and to unshelve.
But that looks cumbersome. Does somebody has an idea?
Thanks
Uwe Brauer
_______________________________________________
Mercurial mailing list
Mercurial@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial
