991 _('interactively select which chunks to apply (EXPERIMENTAL)')), |
991 _('interactively select which chunks to apply (EXPERIMENTAL)')), |
992 ('e', 'edit-lines', None, |
992 ('e', 'edit-lines', None, |
993 _('edit what lines belong to which changesets before commit ' |
993 _('edit what lines belong to which changesets before commit ' |
994 '(EXPERIMENTAL)')), |
994 '(EXPERIMENTAL)')), |
995 ] + commands.dryrunopts + commands.templateopts + commands.walkopts, |
995 ] + commands.dryrunopts + commands.templateopts + commands.walkopts, |
996 _('hg absorb [OPTION] [FILE]...')) |
996 _('hg absorb [OPTION] [FILE]...'), |
|
997 helpcategory=command.CATEGORY_COMMITTING) |
997 def absorbcmd(ui, repo, *pats, **opts): |
998 def absorbcmd(ui, repo, *pats, **opts): |
998 """incorporate corrections into the stack of draft changesets |
999 """incorporate corrections into the stack of draft changesets |
999 |
1000 |
1000 absorb analyzes each change in your working directory and attempts to |
1001 absorb analyzes each change in your working directory and attempts to |
1001 amend the changed lines into the changesets in your stack that first |
1002 amend the changed lines into the changesets in your stack that first |