This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4999

absorb: prompt user to accept absorb changes by default
ClosedPublic

Authored by mbthomas on Oct 12 2018, 11:52 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG31dfa7dac4c9: absorb: prompt user to accept absorb changes by default
Summary

Change the default absorb behaviour to print the changes out and then prompt
the user if they want to absorb the changes or not.

Providing the -p option still prints the result and exits. A new -a option
is provided which applies the changes without printing them, giving the
equivalent of the old behaviour.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mbthomas created this revision.Oct 12 2018, 11:52 AM
indygreg accepted this revision.Oct 12 2018, 1:39 PM
indygreg added a subscriber: indygreg.

Niiice.

This revision is now accepted and ready to land.Oct 12 2018, 1:39 PM
indygreg requested changes to this revision.Oct 12 2018, 1:42 PM

This one failed to apply for some reason. Please resubmit.

This revision now requires changes to proceed.Oct 12 2018, 1:42 PM
mbthomas updated this revision to Diff 11940.Oct 12 2018, 1:54 PM

Rebase and fix conflicts

Closed by commit rHG31dfa7dac4c9: absorb: prompt user to accept absorb changes by default (authored by mbthomas). · Explain WhyOct 12 2018, 2:12 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 11942

hgext/absorb.py

state = fixupstate(stack, ui=ui, opts=opts) state = fixupstate(stack, ui=ui, opts=opts)
matcher = scmutil.match(targetctx, pats, opts) matcher = scmutil.match(targetctx, pats, opts)
if opts.get('interactive'): if opts.get('interactive'):
diff = patch.diff(repo, stack[-1].node(), targetctx.node(), matcher) diff = patch.diff(repo, stack[-1].node(), targetctx.node(), matcher)
origchunks = patch.parsepatch(diff) origchunks = patch.parsepatch(diff)
chunks = cmdutil.recordfilter(ui, origchunks)[0] chunks = cmdutil.recordfilter(ui, origchunks)[0]
targetctx = overlaydiffcontext(stack[-1], chunks) targetctx = overlaydiffcontext(stack[-1], chunks)
fm = None fm = None
if opts.get('print_changes'): if opts.get('print_changes') or not opts.get('apply_changes'):
fm = ui.formatter('absorb', opts) fm = ui.formatter('absorb', opts)
state.diffwith(targetctx, matcher, fm) state.diffwith(targetctx, matcher, fm)
if fm is not None: if fm is not None:
fm.startitem() fm.startitem()
fm.write("count", "\n%d changesets affected\n", len(state.ctxaffected)) fm.write("count", "\n%d changesets affected\n", len(state.ctxaffected))
fm.data(linetype='summary') fm.data(linetype='summary')
for ctx in reversed(stack): for ctx in reversed(stack):
if ctx not in state.ctxaffected: if ctx not in state.ctxaffected:
continue continue
fm.startitem() fm.startitem()
fm.context(ctx=ctx) fm.context(ctx=ctx)
fm.data(linetype='changeset') fm.data(linetype='changeset')
fm.write('node', '%-7.7s ', ctx.hex(), label='absorb.node') fm.write('node', '%-7.7s ', ctx.hex(), label='absorb.node')
descfirstline = ctx.description().splitlines()[0] descfirstline = ctx.description().splitlines()[0]
fm.write('descfirstline', '%s\n', descfirstline, fm.write('descfirstline', '%s\n', descfirstline,
label='absorb.description') label='absorb.description')
fm.end() fm.end()
if not opts.get('dry_run'): if not opts.get('dry_run'):
if not opts.get('apply_changes'):
if ui.promptchoice("apply changes (yn)? $$ &Yes $$ &No", default=1):
raise error.Abort(_('absorb cancelled\n'))
state.apply() state.apply()
if state.commit(): if state.commit():
state.printchunkstats() state.printchunkstats()
elif not ui.quiet: elif not ui.quiet:
ui.write(_('nothing applied\n')) ui.write(_('nothing applied\n'))
return state return state
@command('^absorb', @command('^absorb',
[('p', 'print-changes', None, [('a', 'apply-changes', None,
_('print which changesets are modified by which changes')), _('apply changes without prompting for confirmation')),
('p', 'print-changes', None,
_('just print which changesets are modified by which changes')),
('i', 'interactive', None, ('i', 'interactive', None,
_('interactively select which chunks to apply (EXPERIMENTAL)')), _('interactively select which chunks to apply (EXPERIMENTAL)')),
('e', 'edit-lines', None, ('e', 'edit-lines', None,
_('edit what lines belong to which changesets before commit ' _('edit what lines belong to which changesets before commit '
'(EXPERIMENTAL)')), '(EXPERIMENTAL)')),
] + commands.dryrunopts + commands.templateopts + commands.walkopts, ] + commands.dryrunopts + commands.templateopts + commands.walkopts,
_('hg absorb [OPTION] [FILE]...')) _('hg absorb [OPTION] [FILE]...'))
def absorbcmd(ui, repo, *pats, **opts): def absorbcmd(ui, repo, *pats, **opts):

tests/test-absorb-edit-lines.t

$ for i in 1 2 3; do $ for i in 1 2 3; do
> echo $i >> a > echo $i >> a
> hg commit -A a -m "commit $i" -q > hg commit -A a -m "commit $i" -q
> done > done
absorb --edit-lines will run the editor if filename is provided: absorb --edit-lines will run the editor if filename is provided:
$ hg absorb --edit-lines $ hg absorb --edit-lines --apply-changes
nothing applied nothing applied
[1] [1]
$ HGEDITOR=cat hg absorb --edit-lines a $ HGEDITOR=cat hg absorb --edit-lines --apply-changes a
HG: editing a HG: editing a
HG: "y" means the line to the right exists in the changeset to the top HG: "y" means the line to the right exists in the changeset to the top
HG: HG:
HG: /---- 4ec16f85269a commit 1 HG: /---- 4ec16f85269a commit 1
HG: |/--- 5c5f95224a50 commit 2 HG: |/--- 5c5f95224a50 commit 2
HG: ||/-- 43f0a75bede7 commit 3 HG: ||/-- 43f0a75bede7 commit 3
HG: ||| HG: |||
yyy : 1 yyy : 1
yy : 2 yy : 2
y : 3 y : 3
nothing applied nothing applied
[1] [1]
Edit the file using --edit-lines: Edit the file using --edit-lines:
$ cat > editortext << EOF $ cat > editortext << EOF
> y : a > y : a
> yy : b > yy : b
> y : c > y : c
> yy : d > yy : d
> y y : e > y y : e
> y : f > y : f
> yyy : g > yyy : g
> EOF > EOF
$ HGEDITOR='cat editortext >' hg absorb -q --edit-lines a $ HGEDITOR='cat editortext >' hg absorb -q --edit-lines --apply-changes a
$ hg cat -r 0 a $ hg cat -r 0 a
d d
e e
f f
g g
$ hg cat -r 1 a $ hg cat -r 1 a
b b
c c
d d
g g
$ hg cat -r 2 a $ hg cat -r 2 a
a a
b b
e e
g g

tests/test-absorb-phase.t

> EOS > EOS
$ hg phase -r A --public -q $ hg phase -r A --public -q
$ hg phase -r C --secret --force -q $ hg phase -r C --secret --force -q
$ hg update C -q $ hg update C -q
$ printf B1 > B $ printf B1 > B
$ hg absorb -q $ hg absorb -aq
$ hg log -G -T '{desc} {phase}' $ hg log -G -T '{desc} {phase}'
@ C secret @ C secret
| |
o B draft o B draft
| |
o A public o A public

tests/test-absorb-rename.t

$ hg ci -m 3 $ hg ci -m 3
$ hg annotate -ncf a $ hg annotate -ncf a
0 eff892de26ec a: 1 0 eff892de26ec a: 1
1 bf56e1f4f857 b: 2 1 bf56e1f4f857 b: 2
2 0b888b00216c a: 3 2 0b888b00216c a: 3
$ sedi 's/$/a/' a $ sedi 's/$/a/' a
$ hg absorb -pq $ hg absorb -apq
showing changes for a showing changes for a
@@ -0,3 +0,3 @@ @@ -0,3 +0,3 @@
eff892d -1 eff892d -1
bf56e1f -2 bf56e1f -2
0b888b0 -3 0b888b0 -3
eff892d +1a eff892d +1a
bf56e1f +2a bf56e1f +2a
0b888b0 +3a 0b888b0 +3a
2 9191d121a268 a: 3a 2 9191d121a268 a: 3a
when the first changeset is public when the first changeset is public
$ hg phase --public -r 0 $ hg phase --public -r 0
$ sedi 's/a/A/' a $ sedi 's/a/A/' a
$ hg absorb -pq $ hg absorb -apq
showing changes for a showing changes for a
@@ -0,3 +0,3 @@ @@ -0,3 +0,3 @@
-1a -1a
9a14ffe -2a 9a14ffe -2a
9191d12 -3a 9191d12 -3a
+1A +1A
9a14ffe +2A 9a14ffe +2A
9191d12 +3A 9191d12 +3A
$ hg log -T '{rev}:{node|short} {desc}\n' $ hg log -T '{rev}:{node|short} {desc}\n'
1:17b72129ab68 2 1:17b72129ab68 2
0:eff892de26ec 1 0:eff892de26ec 1
$ sedi 's/$/a/' a $ sedi 's/$/a/' a
$ sedi 's/$/b/' b $ sedi 's/$/b/' b
$ hg absorb -pq $ hg absorb -apq
showing changes for a showing changes for a
@@ -0,1 +0,1 @@ @@ -0,1 +0,1 @@
eff892d -1 eff892d -1
eff892d +1a eff892d +1a
showing changes for b showing changes for b
@@ -0,2 +0,2 @@ @@ -0,2 +0,2 @@
-1 -1
17b7212 -2 17b7212 -2
$ hg log -T '{rev}:{node|short} {desc}\n' $ hg log -T '{rev}:{node|short} {desc}\n'
1:e62c256d8b24 2 1:e62c256d8b24 2
0:55105f940d5c 1 0:55105f940d5c 1
$ sedi 's/$/a/' a $ sedi 's/$/a/' a
$ sedi 's/$/a/' b $ sedi 's/$/a/' b
$ hg absorb -pq $ hg absorb -apq
showing changes for a showing changes for a
@@ -0,2 +0,2 @@ @@ -0,2 +0,2 @@
-1 -1
e62c256 -2 e62c256 -2
+1a +1a
e62c256 +2a e62c256 +2a
showing changes for b showing changes for b
@@ -0,1 +0,1 @@ @@ -0,1 +0,1 @@
$ hg log -T '{rev}:{node|short} {desc}\n' $ hg log -T '{rev}:{node|short} {desc}\n'
1:366daad8e679 cp 1:366daad8e679 cp
0:55105f940d5c 1 0:55105f940d5c 1
$ sedi 's/$/a/' a $ sedi 's/$/a/' a
$ sedi 's/$/c/' c $ sedi 's/$/c/' c
$ hg absorb -pq $ hg absorb -apq
showing changes for a showing changes for a
@@ -0,2 +0,2 @@ @@ -0,2 +0,2 @@
55105f9 -1 55105f9 -1
366daad -2 366daad -2
55105f9 +1a 55105f9 +1a
366daad +2a 366daad +2a
showing changes for c showing changes for c
@@ -0,2 +0,2 @@ @@ -0,2 +0,2 @@
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
+++ b/b +++ b/b
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+1a +1a
run absorb again would apply the change to c run absorb again would apply the change to c
$ hg absorb -pq $ hg absorb -apq
showing changes for c showing changes for c
@@ -0,1 +0,1 @@ @@ -0,1 +0,1 @@
7060601 -1 7060601 -1
7060601 +1c 7060601 +1c
1 changesets affected 1 changesets affected
7060601 cp 7060601 cp
$ hg log -T '{rev}:{node|short} {desc}\n' $ hg log -T '{rev}:{node|short} {desc}\n'
2:49911557c471 mv 2:49911557c471 mv
1:7bc3d43ede83 cp 1:7bc3d43ede83 cp
0:55105f940d5c 1 0:55105f940d5c 1
$ sedi 's/$/e/' e $ sedi 's/$/e/' e
$ sedi 's/$/d/' d $ sedi 's/$/d/' d
$ hg absorb -pq $ hg absorb -apq
showing changes for d showing changes for d
@@ -0,2 +0,2 @@ @@ -0,2 +0,2 @@
55105f9 -1 55105f9 -1
7bc3d43 -4 7bc3d43 -4
55105f9 +1d 55105f9 +1d
7bc3d43 +4d 7bc3d43 +4d
showing changes for e showing changes for e
@@ -0,2 +0,2 @@ @@ -0,2 +0,2 @@

tests/test-absorb-strip.t

> B > B
> | > |
> A > A
> EOF > EOF
$ hg up E -q $ hg up E -q
$ echo 1 >> B $ echo 1 >> B
$ echo 2 >> D $ echo 2 >> D
$ hg absorb $ hg absorb -a
saved backup bundle to * (glob) saved backup bundle to * (glob)
2 of 2 chunk(s) applied 2 of 2 chunk(s) applied
$ hg log -G -T '{desc}' $ hg log -G -T '{desc}'
@ E @ E
| |
o D o D
| |

tests/test-absorb.t

4 changesets affected 4 changesets affected
4f55fa6 commit 5 4f55fa6 commit 5
ad8b8b7 commit 4 ad8b8b7 commit 4
5c5f952 commit 2 5c5f952 commit 2
4ec16f8 commit 1 4ec16f8 commit 1
Run absorb: Run absorb:
$ hg absorb $ hg absorb --apply-changes
saved backup bundle to * (glob) saved backup bundle to * (glob)
2 of 2 chunk(s) applied 2 of 2 chunk(s) applied
$ hg annotate a $ hg annotate a
0: 1a 0: 1a
1: 2b 1: 2b
2: 3 2: 3
3: 4d 3: 4d
4: 5e 4: 5e
Delete a few lines and related commits will be removed if they will be empty: Delete a few lines and related commits will be removed if they will be empty:
$ cat > a <<EOF $ cat > a <<EOF
> 2b > 2b
> 4d > 4d
> EOF > EOF
$ hg absorb $ echo y | hg absorb --config ui.interactive=1
showing changes for a
@@ -0,1 +0,0 @@
f548282 -1a
@@ -2,1 +1,0 @@
ff5d556 -3
@@ -4,1 +2,0 @@
84e5416 -5e
3 changesets affected
84e5416 commit 5
ff5d556 commit 3
f548282 commit 1
apply changes (yn)? y
saved backup bundle to * (glob) saved backup bundle to * (glob)
3 of 3 chunk(s) applied 3 of 3 chunk(s) applied
$ hg annotate a $ hg annotate a
1: 2b 1: 2b
2: 4d 2: 4d
$ hg log -T '{rev} {desc}\n' -Gp $ hg log -T '{rev} {desc}\n' -Gp
@ 2 commit 4 @ 2 commit 4
| diff -r 1cae118c7ed8 -r 58a62bade1c6 a | diff -r 1cae118c7ed8 -r 58a62bade1c6 a
| +2b | +2b
| |
o 0 commit 1 o 0 commit 1
Non 1:1 map changes will be ignored: Non 1:1 map changes will be ignored:
$ echo 1 > a $ echo 1 > a
$ hg absorb $ hg absorb --apply-changes
nothing applied nothing applied
[1] [1]
Insertaions: Insertaions:
$ cat > a << EOF $ cat > a << EOF
> insert before 2b > insert before 2b
> 2b > 2b
> 4d > 4d
> insert aftert 4d > insert aftert 4d
> EOF > EOF
$ hg absorb -q $ hg absorb -q --apply-changes
$ hg status $ hg status
$ hg annotate a $ hg annotate a
1: insert before 2b 1: insert before 2b
1: 2b 1: 2b
2: 4d 2: 4d
2: insert aftert 4d 2: insert aftert 4d
Bookmarks are moved: Bookmarks are moved:
$ hg bookmark -r 1 b1 $ hg bookmark -r 1 b1
$ hg bookmark -r 2 b2 $ hg bookmark -r 2 b2
$ hg bookmark ba $ hg bookmark ba
$ hg bookmarks $ hg bookmarks
b1 1:b35060a57a50 b1 1:b35060a57a50
b2 2:946e4bc87915 b2 2:946e4bc87915
* ba 2:946e4bc87915 * ba 2:946e4bc87915
$ sedi 's/insert/INSERT/' a $ sedi 's/insert/INSERT/' a
$ hg absorb -q $ hg absorb -q --apply-changes
$ hg status $ hg status
$ hg bookmarks $ hg bookmarks
b1 1:a4183e9b3d31 b1 1:a4183e9b3d31
b2 2:c9b20c925790 b2 2:c9b20c925790
* ba 2:c9b20c925790 * ba 2:c9b20c925790
Non-mofified files are ignored: Non-mofified files are ignored:
$ touch b $ touch b
$ hg commit -A b -m b $ hg commit -A b -m b
$ touch c $ touch c
$ hg add c $ hg add c
$ hg rm b $ hg rm b
$ hg absorb $ hg absorb --apply-changes
nothing applied nothing applied
[1] [1]
$ sedi 's/INSERT/Insert/' a $ sedi 's/INSERT/Insert/' a
$ hg absorb $ hg absorb --apply-changes
saved backup bundle to * (glob) saved backup bundle to * (glob)
2 of 2 chunk(s) applied 2 of 2 chunk(s) applied
$ hg status $ hg status
A c A c
R b R b
Public commits will not be changed: Public commits will not be changed:
$ hg phase -p 1 $ hg phase -p 1
$ sedi 's/Insert/insert/' a $ sedi 's/Insert/insert/' a
$ hg absorb -pn $ hg absorb -pn
showing changes for a showing changes for a
@@ -0,1 +0,1 @@ @@ -0,1 +0,1 @@
-Insert before 2b -Insert before 2b
+insert before 2b +insert before 2b
@@ -3,1 +3,1 @@ @@ -3,1 +3,1 @@
85b4e0e -Insert aftert 4d 85b4e0e -Insert aftert 4d
85b4e0e +insert aftert 4d 85b4e0e +insert aftert 4d
1 changesets affected 1 changesets affected
85b4e0e commit 4 85b4e0e commit 4
$ hg absorb $ hg absorb --apply-changes
saved backup bundle to * (glob) saved backup bundle to * (glob)
1 of 2 chunk(s) applied 1 of 2 chunk(s) applied
$ hg diff -U 0 $ hg diff -U 0
diff -r 1c8eadede62a a diff -r 1c8eadede62a a
--- a/a Thu Jan 01 00:00:00 1970 +0000 --- a/a Thu Jan 01 00:00:00 1970 +0000
+++ b/a * (glob) +++ b/a * (glob)
@@ -1,1 +1,1 @@ @@ -1,1 +1,1 @@
-Insert before 2b -Insert before 2b
o 2 commit 4 draft o 2 commit 4 draft
| |
o 1 commit 2 public o 1 commit 2 public
| |
o 0 commit 1 public o 0 commit 1 public
$ echo 2 >> m1 $ echo 2 >> m1
$ echo 2 >> m2 $ echo 2 >> m2
$ hg absorb $ hg absorb --apply-changes
abort: no mutable changeset to change abort: no mutable changeset to change
[255] [255]
$ hg revert -q -C m1 m2 $ hg revert -q -C m1 m2
Use a new repo: Use a new repo:
$ cd .. $ cd ..
$ hg init repo2 $ hg init repo2
> done > done
Use pattern to select files to be fixed up: Use pattern to select files to be fixed up:
$ sedi 's/line/Line/' a b $ sedi 's/line/Line/' a b
$ hg status $ hg status
M a M a
M b M b
$ hg absorb a $ hg absorb --apply-changes a
saved backup bundle to * (glob) saved backup bundle to * (glob)
1 of 1 chunk(s) applied 1 of 1 chunk(s) applied
$ hg status $ hg status
M b M b
$ hg absorb --exclude b $ hg absorb --apply-changes --exclude b
nothing applied nothing applied
[1] [1]
$ hg absorb b $ hg absorb --apply-changes b
saved backup bundle to * (glob) saved backup bundle to * (glob)
1 of 1 chunk(s) applied 1 of 1 chunk(s) applied
$ hg status $ hg status
$ cat a b $ cat a b
a Line 1 a Line 1
a Line 2 a Line 2
b Line 1 b Line 1
b Line 2 b Line 2
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [experimental] > [experimental]
> evolution=createmarkers > evolution=createmarkers
> [absorb] > [absorb]
> add-noise=1 > add-noise=1
> EOF > EOF
$ hg --config absorb.max-stack-size=3 absorb $ hg --config absorb.max-stack-size=3 absorb -a
absorb: only the recent 3 changesets will be analysed absorb: only the recent 3 changesets will be analysed
2 of 2 chunk(s) applied 2 of 2 chunk(s) applied
$ hg log -T '{rev}:{node|short} {desc} {get(extras, "absorb_source")}\n' $ hg log -T '{rev}:{node|short} {desc} {get(extras, "absorb_source")}\n'
6:3dfde4199b46 commit b 2 712d16a8f445834e36145408eabc1d29df05ec09 6:3dfde4199b46 commit b 2 712d16a8f445834e36145408eabc1d29df05ec09
5:99cfab7da5ff commit b 1 74cfa6294160149d60adbf7582b99ce37a4597ec 5:99cfab7da5ff commit b 1 74cfa6294160149d60adbf7582b99ce37a4597ec
4:fec2b3bd9e08 commit a 2 28f10dcf96158f84985358a2e5d5b3505ca69c22 4:fec2b3bd9e08 commit a 2 28f10dcf96158f84985358a2e5d5b3505ca69c22
0:f9a81da8dc53 commit a 1 0:f9a81da8dc53 commit a 1
$ hg absorb $ hg absorb --apply-changes
1 of 1 chunk(s) applied 1 of 1 chunk(s) applied
$ hg log -T '{rev}:{node|short} {desc} {get(extras, "absorb_source")}\n' $ hg log -T '{rev}:{node|short} {desc} {get(extras, "absorb_source")}\n'
10:e1c8c1e030a4 commit b 2 3dfde4199b4610ea6e3c6fa9f5bdad8939d69524 10:e1c8c1e030a4 commit b 2 3dfde4199b4610ea6e3c6fa9f5bdad8939d69524
9:816c30955758 commit b 1 99cfab7da5ffdaf3b9fc6643b14333e194d87f46 9:816c30955758 commit b 1 99cfab7da5ffdaf3b9fc6643b14333e194d87f46
8:5867d584106b commit a 2 fec2b3bd9e0834b7cb6a564348a0058171aed811 8:5867d584106b commit a 2 fec2b3bd9e0834b7cb6a564348a0058171aed811
7:8c76602baf10 commit a 1 f9a81da8dc53380ed91902e5b82c1b36255a4bd0 7:8c76602baf10 commit a 1 f9a81da8dc53380ed91902e5b82c1b36255a4bd0
Executable files: Executable files:
$ hg absorb --dry-run --print-changes $ hg absorb --dry-run --print-changes
showing changes for foo.py showing changes for foo.py
@@ -0,1 +0,1 @@ @@ -0,1 +0,1 @@
99b4ae7 - 99b4ae7 -
99b4ae7 +bla 99b4ae7 +bla
1 changesets affected 1 changesets affected
99b4ae7 foo 99b4ae7 foo
$ hg absorb $ hg absorb --apply-changes
1 of 1 chunk(s) applied 1 of 1 chunk(s) applied
$ hg diff -c . $ hg diff -c .
diff --git a/foo.py b/foo.py diff --git a/foo.py b/foo.py
new file mode 100755 new file mode 100755
--- /dev/null --- /dev/null
+++ b/foo.py +++ b/foo.py
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+bla +bla
30970db -3 30970db -3
a393a58 -4 a393a58 -4
4 changesets affected 4 changesets affected
a393a58 b4 a393a58 b4
30970db b3 30970db b3
1154859 b12 1154859 b12
bfafb49 a12 bfafb49 a12
$ hg absorb -v | grep became $ hg absorb -av | grep became
0:bfafb49242db: 1 file(s) changed, became 4:1a2de97fc652 0:bfafb49242db: 1 file(s) changed, became 4:1a2de97fc652
1:115485984805: 2 file(s) changed, became 5:0c930dfab74c 1:115485984805: 2 file(s) changed, became 5:0c930dfab74c
2:30970dbf7b40: became empty and was dropped 2:30970dbf7b40: became empty and was dropped
3:a393a58b9a85: became empty and was dropped 3:a393a58b9a85: became empty and was dropped
$ hg log -T '{rev} {desc}\n' -Gp $ hg log -T '{rev} {desc}\n' -Gp
@ 5 b12 @ 5 b12
| diff --git a/b b/b | diff --git a/b b/b
| new file mode 100644 | new file mode 100644
showing changes for a showing changes for a
@@ -2,2 +2,0 @@ @@ -2,2 +2,0 @@
f1c23dd -3 f1c23dd -3
82dbe7f -4 82dbe7f -4
2 changesets affected 2 changesets affected
82dbe7f a1234 82dbe7f a1234
f1c23dd a123 f1c23dd a123
$ hg absorb --verbose $ hg absorb --apply-changes --verbose
1:f1c23dd5d08d: became empty and was dropped 1:f1c23dd5d08d: became empty and was dropped
2:82dbe7fd19f0: became empty and was dropped 2:82dbe7fd19f0: became empty and was dropped
a: 1 of 1 chunk(s) applied a: 1 of 1 chunk(s) applied
$ hg id $ hg id
bfafb49242db tip bfafb49242db tip