Andreas Schneider a écrit : > On Wednesday 06 May 2009 13:30:24 Laurent Tarrisse wrote: > >> I just tried to help ! >> >> > > Thanks for that. > > >> Now if you cannot do a patch with mercurial, maybe send just a diff >> (diff -u file.orig file) it will be more interesting than your git patch // >> >> > > I didn't create the patch. > > >> Take a look at : >> http://texagon.blogspot.com/2008/02/use-mercurial-you-git.html , just >> for launch the troll ;-) >> > > Well this is completely outdated. > The problem with mecurial is to do the following workflow. > > Create an inline branch > Add your changes > Rebase the tree to have a nice patchset > you could use "pull" to merge, but maybe you prefer to keep the history in a simple series of commits without any *merges* > Send it upstream > Throw away your branch You can try :
hg export changeset_which_form_the_branch hg strip -r first_changeset_in_the_branch hg pull hg import changeset_which_form_the_branch or you can push/pull between 2 local repositories ... > The last patch took about 5 minutes to write and it took me 2 hours to create > a branch and don't mess up the hg tree. > If you can tell me how to do this I would be happy. > > >> Laurent >> >> > > -- andreas > > ------------------------------------------------------------------------ > > _______________________________________________ > QuteCom-dev mailing list > [email protected] > http://lists.qutecom.org/mailman/listinfo/qutecom-dev > _______________________________________________ QuteCom-dev mailing list [email protected] http://lists.qutecom.org/mailman/listinfo/qutecom-dev
