This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5395

rebase: clarify that commits that become empty are skipped
ClosedPublic

Authored by martinvonz on Dec 7 2018, 5:27 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG4edd427f34c1: rebase: clarify that commits that become empty are skipped
Summary

Our message just said that it created no changes, but we didn't
explicitly say that that meant that the the commit was not rebased. It
also wasn't clear why it created no changes, so this patch also
clarifies that that was because the changes were already in the
destination.

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

martinvonz created this revision.Dec 7 2018, 5:27 PM
Closed by commit rHG4edd427f34c1: rebase: clarify that commits that become empty are skipped (authored by martinvonz). · Explain WhyDec 9 2018, 12:02 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 12757

hgext/rebase.py

repo.setparents(repo[p1].node()) repo.setparents(repo[p1].node())
newnode = None newnode = None
# Update the state # Update the state
if newnode is not None: if newnode is not None:
self.state[rev] = repo[newnode].rev() self.state[rev] = repo[newnode].rev()
ui.debug('rebased as %s\n' % short(newnode)) ui.debug('rebased as %s\n' % short(newnode))
else: else:
if not self.collapsef: if not self.collapsef:
ui.warn(_('note: rebase of %s created no changes ' ui.warn(_('note: not rebasing %s, its destination already '
'to commit\n') % desc) 'has all its changes\n') % desc)
self.skipped.add(rev) self.skipped.add(rev)
self.state[rev] = p1 self.state[rev] = p1
ui.debug('next revision set to %d\n' % p1) ui.debug('next revision set to %d\n' % p1)
else: else:
ui.status(_('already rebased %s as %s\n') % ui.status(_('already rebased %s as %s\n') %
(desc, repo[self.state[rev]])) (desc, repo[self.state[rev]]))
if not tr: if not tr:
# When not using single transaction, store state after each # When not using single transaction, store state after each

tests/test-rebase-abort.t

| o 2:secret 'C' | o 2:secret 'C'
| | | |
| o 1:public 'B' | o 1:public 'B'
|/ |/
o 0:public 'A' o 0:public 'A'
$ hg rebase -b 4 -d 2 $ hg rebase -b 4 -d 2
rebasing 3:a6484957d6b9 "B bis" rebasing 3:a6484957d6b9 "B bis"
note: rebase of 3:a6484957d6b9 "B bis" created no changes to commit note: not rebasing 3:a6484957d6b9 "B bis", its destination already has all its changes
rebasing 4:145842775fec "C1" (tip) rebasing 4:145842775fec "C1" (tip)
merging c merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark') warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ hg tglog $ hg tglog
@ 4:draft 'C1' @ 4:draft 'C1'
$ echo 'content' > disappear $ echo 'content' > disappear
commit will disappear commit will disappear
$ hg commit -A -m 'disappear draft' -q $ hg commit -A -m 'disappear draft' -q
$ echo 'addedcontADDEDentadded' > root $ echo 'addedcontADDEDentadded' > root
commit will cause merge conflict on rebase commit will cause merge conflict on rebase
$ hg commit -m 'add content draft' -q $ hg commit -m 'add content draft' -q
$ hg rebase -d 'public()' --tool :merge -q $ hg rebase -d 'public()' --tool :merge -q
note: rebase of 3:0682fd3dabf5 "disappear draft" created no changes to commit note: not rebasing 3:0682fd3dabf5 "disappear draft", its destination already has all its changes
warning: conflicts while merging root! (edit, then use 'hg resolve --mark') warning: conflicts while merging root! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ hg rebase --abort $ hg rebase --abort
rebase aborted rebase aborted
$ cd .. $ cd ..

tests/test-rebase-cache.t

| o 2: 'B' branch1 | o 2: 'B' branch1
| | | |
| o 1: 'branch1' branch1 | o 1: 'branch1' branch1
|/ |/
o 0: 'A' o 0: 'A'
$ hg rebase -s 7 -d 6 $ hg rebase -s 7 -d 6
rebasing 7:653b9feb4616 "branch3" rebasing 7:653b9feb4616 "branch3"
note: rebase of 7:653b9feb4616 "branch3" created no changes to commit note: not rebasing 7:653b9feb4616 "branch3", its destination already has all its changes
rebasing 8:4666b71e8e32 "F" (tip) rebasing 8:4666b71e8e32 "F" (tip)
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/653b9feb4616-3c88de16-rebase.hg saved backup bundle to $TESTTMP/a3/.hg/strip-backup/653b9feb4616-3c88de16-rebase.hg
$ hg branches $ hg branches
branch2 7:6b4bdc1b5ac0 branch2 7:6b4bdc1b5ac0
branch1 2:0a03079c47fd (inactive) branch1 2:0a03079c47fd (inactive)
default 0:1994f17a630e (inactive) default 0:1994f17a630e (inactive)

tests/test-rebase-collapse.t

| o 2: 8ac4a08debf1 'C' two | o 2: 8ac4a08debf1 'C' two
| | | |
| o 1: 1ba175478953 'B' one | o 1: 1ba175478953 'B' one
|/ |/
o 0: 1994f17a630e 'A' o 0: 1994f17a630e 'A'
$ hg rebase -s 5 -d 4 $ hg rebase -s 5 -d 4
rebasing 5:fbfb97b1089a "E" (tip) rebasing 5:fbfb97b1089a "E" (tip)
note: rebase of 5:fbfb97b1089a "E" (tip) created no changes to commit note: not rebasing 5:fbfb97b1089a "E" (tip), its destination already has all its changes
saved backup bundle to $TESTTMP/e/.hg/strip-backup/fbfb97b1089a-553e1d85-rebase.hg saved backup bundle to $TESTTMP/e/.hg/strip-backup/fbfb97b1089a-553e1d85-rebase.hg
$ hg tglog $ hg tglog
@ 4: f338eb3c2c7c 'E' @ 4: f338eb3c2c7c 'E'
| |
o 3: 41acb9dca9eb 'D' o 3: 41acb9dca9eb 'D'
| |
| o 2: 8ac4a08debf1 'C' two | o 2: 8ac4a08debf1 'C' two
| | | |

tests/test-rebase-detach.t

warning: conflicts while merging B! (edit, then use 'hg resolve --mark') warning: conflicts while merging B! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ hg resolve --all -t internal:local $ hg resolve --all -t internal:local
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase -c $ hg rebase -c
rebasing 3:17b4880d2402 "B2" (tip) rebasing 3:17b4880d2402 "B2" (tip)
note: rebase of 3:17b4880d2402 "B2" (tip) created no changes to commit note: not rebasing 3:17b4880d2402 "B2" (tip), its destination already has all its changes
saved backup bundle to $TESTTMP/a7/.hg/strip-backup/17b4880d2402-1ae1f6cc-rebase.hg saved backup bundle to $TESTTMP/a7/.hg/strip-backup/17b4880d2402-1ae1f6cc-rebase.hg
$ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n"
o 2:draft 'C' o 2:draft 'C'
| |
| @ 1:draft 'B' | @ 1:draft 'B'
|/ |/
o 0:draft 'A' o 0:draft 'A'
$ cd .. $ cd ..

tests/test-rebase-emptycommit.t

o | 1 B o | 1 B
|/ |/
o 0 A o 0 A
With --keep, bookmark should move With --keep, bookmark should move
$ hg rebase -r 3+4 -d E --keep $ hg rebase -r 3+4 -d E --keep
rebasing 3:e7b3f00ed42e "D" (BOOK-D) rebasing 3:e7b3f00ed42e "D" (BOOK-D)
note: rebase of 3:e7b3f00ed42e "D" (BOOK-D) created no changes to commit note: not rebasing 3:e7b3f00ed42e "D" (BOOK-D), its destination already has all its changes
rebasing 4:69a34c08022a "E" (BOOK-E) rebasing 4:69a34c08022a "E" (BOOK-E)
note: rebase of 4:69a34c08022a "E" (BOOK-E) created no changes to commit note: not rebasing 4:69a34c08022a "E" (BOOK-E), its destination already has all its changes
$ hg log -G -T '{rev} {desc} {bookmarks}' $ hg log -G -T '{rev} {desc} {bookmarks}'
o 7 E BOOK-D BOOK-E o 7 E BOOK-D BOOK-E
| |
o 6 D o 6 D
| |
| o 5 F BOOK-F | o 5 F BOOK-F
| | | |
| o 4 E | o 4 E
Bookmark is usually an indication of a head. For changes that are introduced by Bookmark is usually an indication of a head. For changes that are introduced by
an ancestor of bookmark B, after moving B to B-NEW, the changes are ideally an ancestor of bookmark B, after moving B to B-NEW, the changes are ideally
still introduced by an ancestor of changeset on B-NEW. In the below case, still introduced by an ancestor of changeset on B-NEW. In the below case,
"BOOK-D", and "BOOK-E" include changes introduced by "C". "BOOK-D", and "BOOK-E" include changes introduced by "C".
$ hg rebase -s 2 -d E $ hg rebase -s 2 -d E
rebasing 2:dc0947a82db8 "C" (BOOK-C C) rebasing 2:dc0947a82db8 "C" (BOOK-C C)
rebasing 3:e7b3f00ed42e "D" (BOOK-D) rebasing 3:e7b3f00ed42e "D" (BOOK-D)
note: rebase of 3:e7b3f00ed42e "D" (BOOK-D) created no changes to commit note: not rebasing 3:e7b3f00ed42e "D" (BOOK-D), its destination already has all its changes
rebasing 4:69a34c08022a "E" (BOOK-E) rebasing 4:69a34c08022a "E" (BOOK-E)
note: rebase of 4:69a34c08022a "E" (BOOK-E) created no changes to commit note: not rebasing 4:69a34c08022a "E" (BOOK-E), its destination already has all its changes
rebasing 5:6b2aeab91270 "F" (BOOK-F F) rebasing 5:6b2aeab91270 "F" (BOOK-F F)
saved backup bundle to $TESTTMP/non-merge/.hg/strip-backup/dc0947a82db8-52bb4973-rebase.hg saved backup bundle to $TESTTMP/non-merge/.hg/strip-backup/dc0947a82db8-52bb4973-rebase.hg
$ hg log -G -T '{rev} {desc} {bookmarks}' $ hg log -G -T '{rev} {desc} {bookmarks}'
o 5 F BOOK-F o 5 F BOOK-F
| |
o 4 C BOOK-C BOOK-D BOOK-E o 4 C BOOK-C BOOK-D BOOK-E
| |
o 3 E o 3 E
> | > |
> C > C
> | > |
> B > B
> EOS > EOS
$ hg rebase -r '(A::)-(B::)-A' -d H $ hg rebase -r '(A::)-(B::)-A' -d H
rebasing 2:dc0947a82db8 "C" (BOOK-C) rebasing 2:dc0947a82db8 "C" (BOOK-C)
note: rebase of 2:dc0947a82db8 "C" (BOOK-C) created no changes to commit note: not rebasing 2:dc0947a82db8 "C" (BOOK-C), its destination already has all its changes
rebasing 3:b18e25de2cf5 "D" (BOOK-D) rebasing 3:b18e25de2cf5 "D" (BOOK-D)
note: rebase of 3:b18e25de2cf5 "D" (BOOK-D) created no changes to commit note: not rebasing 3:b18e25de2cf5 "D" (BOOK-D), its destination already has all its changes
rebasing 4:86a1f6686812 "E" (BOOK-E E) rebasing 4:86a1f6686812 "E" (BOOK-E E)
note: rebase of 4:86a1f6686812 "E" (BOOK-E E) created no changes to commit note: not rebasing 4:86a1f6686812 "E" (BOOK-E E), its destination already has all its changes
saved backup bundle to $TESTTMP/merge1/.hg/strip-backup/b18e25de2cf5-1fd0a4ba-rebase.hg saved backup bundle to $TESTTMP/merge1/.hg/strip-backup/b18e25de2cf5-1fd0a4ba-rebase.hg
$ hg log -G -T '{rev} {desc} {bookmarks}' $ hg log -G -T '{rev} {desc} {bookmarks}'
o 4 H BOOK-C BOOK-D BOOK-E o 4 H BOOK-C BOOK-D BOOK-E
| |
o 3 D o 3 D
| |
o 2 C o 2 C
> | > |
> C > C
> | > |
> B > B
> EOS > EOS
$ hg rebase -r '(A::)-(B::)-A' -d H $ hg rebase -r '(A::)-(B::)-A' -d H
rebasing 2:dc0947a82db8 "C" (BOOK-C) rebasing 2:dc0947a82db8 "C" (BOOK-C)
note: rebase of 2:dc0947a82db8 "C" (BOOK-C) created no changes to commit note: not rebasing 2:dc0947a82db8 "C" (BOOK-C), its destination already has all its changes
rebasing 3:b18e25de2cf5 "D" (BOOK-D D) rebasing 3:b18e25de2cf5 "D" (BOOK-D D)
rebasing 4:03ca77807e91 "E" (BOOK-E E) rebasing 4:03ca77807e91 "E" (BOOK-E E)
rebasing 5:ad6717a6a58e "F" (BOOK-F) rebasing 5:ad6717a6a58e "F" (BOOK-F)
note: rebase of 5:ad6717a6a58e "F" (BOOK-F) created no changes to commit note: not rebasing 5:ad6717a6a58e "F" (BOOK-F), its destination already has all its changes
rebasing 6:c58e8bdac1f4 "G" (BOOK-G G) rebasing 6:c58e8bdac1f4 "G" (BOOK-G G)
saved backup bundle to $TESTTMP/merge2/.hg/strip-backup/b18e25de2cf5-2d487005-rebase.hg saved backup bundle to $TESTTMP/merge2/.hg/strip-backup/b18e25de2cf5-2d487005-rebase.hg
$ hg log -G -T '{rev} {desc} {bookmarks}' $ hg log -G -T '{rev} {desc} {bookmarks}'
o 7 G BOOK-G o 7 G BOOK-G
|\ |\
| o 6 E BOOK-E | o 6 E BOOK-E
| | | |

tests/test-rebase-interruptions.t

[1] [1]
$ echo a > a $ echo a > a
$ echo c >> a $ echo c >> a
$ hg resolve --mark a $ hg resolve --mark a
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase --continue $ hg rebase --continue
rebasing 1:fdaca8533b86 "b" rebasing 1:fdaca8533b86 "b"
note: rebase of 1:fdaca8533b86 "b" created no changes to commit note: not rebasing 1:fdaca8533b86 "b", its destination already has all its changes
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg
$ hg resolve --list $ hg resolve --list
$ test -d .hg/merge $ test -d .hg/merge
[1] [1]
Now try again with --collapse Now try again with --collapse
$ hg unbundle -q .hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg $ hg unbundle -q .hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg
$ hg rebase -s 2 -d 1 --noninteractive --collapse $ hg rebase -s 2 -d 1 --noninteractive --collapse
rebasing 2:fdaca8533b86 "b" (tip) rebasing 2:fdaca8533b86 "b" (tip)

tests/test-rebase-mq-skip.t

resolving manifests resolving manifests
getting p0 getting p0
committing files: committing files:
p0 p0
committing manifest committing manifest
committing changelog committing changelog
rebasing 3:148775c71080 "P1" (p1.patch qtip) rebasing 3:148775c71080 "P1" (p1.patch qtip)
resolving manifests resolving manifests
note: rebase of 3:148775c71080 "P1" (p1.patch qtip) created no changes to commit note: not rebasing 3:148775c71080 "P1" (p1.patch qtip), its destination already has all its changes
rebase merging completed rebase merging completed
updating mq patch p0.patch to 5:9ecc820b1737 updating mq patch p0.patch to 5:9ecc820b1737
$TESTTMP/a/.hg/patches/p0.patch $TESTTMP/a/.hg/patches/p0.patch
2 changesets found 2 changesets found
uncompressed size of bundle content: uncompressed size of bundle content:
348 (changelog) 348 (changelog)
324 (manifests) 324 (manifests)
129 p0 129 p0
$ echo r6 > r6 $ echo r6 > r6
$ hg ci -Am branch2-r6 $ hg ci -Am branch2-r6
adding r6 adding r6
$ hg up -q qtip $ hg up -q qtip
$ HGMERGE=internal:fail hg rebase $ HGMERGE=internal:fail hg rebase
rebasing 1:b4bffa6e4776 "r1" (qbase r1) rebasing 1:b4bffa6e4776 "r1" (qbase r1)
note: rebase of 1:b4bffa6e4776 "r1" (qbase r1) created no changes to commit note: not rebasing 1:b4bffa6e4776 "r1" (qbase r1), its destination already has all its changes
rebasing 2:c0fd129beb01 "r2" (r2) rebasing 2:c0fd129beb01 "r2" (r2)
rebasing 3:6ff5b8feed8e "r3" (r3) rebasing 3:6ff5b8feed8e "r3" (r3)
note: rebase of 3:6ff5b8feed8e "r3" (r3) created no changes to commit note: not rebasing 3:6ff5b8feed8e "r3" (r3), its destination already has all its changes
rebasing 4:094320fec554 "r4" (r4) rebasing 4:094320fec554 "r4" (r4)
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ HGMERGE=internal:local hg resolve --all $ HGMERGE=internal:local hg resolve --all
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase --continue $ hg rebase --continue
already rebased 1:b4bffa6e4776 "r1" (qbase r1) as 057f55ff8f44 already rebased 1:b4bffa6e4776 "r1" (qbase r1) as 057f55ff8f44
already rebased 2:c0fd129beb01 "r2" (r2) as 1660ab13ce9a already rebased 2:c0fd129beb01 "r2" (r2) as 1660ab13ce9a
already rebased 3:6ff5b8feed8e "r3" (r3) as 1660ab13ce9a already rebased 3:6ff5b8feed8e "r3" (r3) as 1660ab13ce9a
rebasing 4:094320fec554 "r4" (r4) rebasing 4:094320fec554 "r4" (r4)
note: rebase of 4:094320fec554 "r4" (r4) created no changes to commit note: not rebasing 4:094320fec554 "r4" (r4), its destination already has all its changes
rebasing 5:681a378595ba "r5" (r5) rebasing 5:681a378595ba "r5" (r5)
rebasing 6:512a1f24768b "r6" (qtip r6) rebasing 6:512a1f24768b "r6" (qtip r6)
note: rebase of 6:512a1f24768b "r6" (qtip r6) created no changes to commit note: not rebasing 6:512a1f24768b "r6" (qtip r6), its destination already has all its changes
saved backup bundle to $TESTTMP/b/.hg/strip-backup/b4bffa6e4776-b9bfb84d-rebase.hg saved backup bundle to $TESTTMP/b/.hg/strip-backup/b4bffa6e4776-b9bfb84d-rebase.hg
$ hg tglog $ hg tglog
@ 8: 0b9735ce8f0a 'r5' tags: qtip r5 tip @ 8: 0b9735ce8f0a 'r5' tags: qtip r5 tip
| |
o 7: 1660ab13ce9a 'r2' tags: qbase r2 o 7: 1660ab13ce9a 'r2' tags: qbase r2
| |
o 6: 057f55ff8f44 'branch2-r6' tags: qparent o 6: 057f55ff8f44 'branch2-r6' tags: qparent

tests/test-rebase-mq.t

$ hg qseries $ hg qseries
guarded guarded
empty-important empty-important
bar bar
foo foo
$ [ -f .hg/patches/empty-important ] $ [ -f .hg/patches/empty-important ]
$ hg -q rebase -d 2 $ hg -q rebase -d 2
note: rebase of 1:0aaf4c3af7eb "important commit message" (empty-important qbase) created no changes to commit note: not rebasing 1:0aaf4c3af7eb "important commit message" (empty-important qbase), its destination already has all its changes
$ hg qseries $ hg qseries
guarded guarded
bar bar
foo foo
$ [ -f .hg/patches/empty-important ] $ [ -f .hg/patches/empty-important ]
[1] [1]
$ hg qguard -l $ hg qguard -l

tests/test-rebase-named-branches.t

o | 2: 5fddd98957c8 'C' o | 2: 5fddd98957c8 'C'
| | | |
o | 1: 42ccdea3bb16 'B' o | 1: 42ccdea3bb16 'B'
|/ |/
o 0: cd010b8cd998 'A' o 0: cd010b8cd998 'A'
$ hg rebase -b 'max(branch("dev-two"))' -d dev-one --keepbranches $ hg rebase -b 'max(branch("dev-two"))' -d dev-one --keepbranches
rebasing 5:bc8139ee757c "dev-one named branch" rebasing 5:bc8139ee757c "dev-one named branch"
note: rebase of 5:bc8139ee757c "dev-one named branch" created no changes to commit note: not rebasing 5:bc8139ee757c "dev-one named branch", its destination already has all its changes
rebasing 6:42aa3cf0fa7a "F" rebasing 6:42aa3cf0fa7a "F"
rebasing 7:1a1e6f72ec38 "G" rebasing 7:1a1e6f72ec38 "G"
rebasing 8:904590360559 "H" rebasing 8:904590360559 "H"
rebasing 9:59c2e59309fe "dev-two named branch" rebasing 9:59c2e59309fe "dev-two named branch"
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/bc8139ee757c-f11c1080-rebase.hg saved backup bundle to $TESTTMP/a1/.hg/strip-backup/bc8139ee757c-f11c1080-rebase.hg
$ hg tglog $ hg tglog
o 9: 71325f8bc082 'dev-two named branch' dev-two o 9: 71325f8bc082 'dev-two named branch' dev-two
$ hg clone -q . ../case2 $ hg clone -q . ../case2
rebase 'b2' to another lower branch head rebase 'b2' to another lower branch head
$ hg up -qr 2 $ hg up -qr 2
$ hg rebase $ hg rebase
rebasing 2:792845bb77ee "b2" rebasing 2:792845bb77ee "b2"
note: rebase of 2:792845bb77ee "b2" created no changes to commit note: not rebasing 2:792845bb77ee "b2", its destination already has all its changes
saved backup bundle to $TESTTMP/case1/.hg/strip-backup/792845bb77ee-627120ee-rebase.hg saved backup bundle to $TESTTMP/case1/.hg/strip-backup/792845bb77ee-627120ee-rebase.hg
$ hg tglog $ hg tglog
o 2: c062e3ecd6c6 'c1' c o 2: c062e3ecd6c6 'c1' c
| |
| @ 1: 40039acb7ca5 'b1' b | @ 1: 40039acb7ca5 'b1' b
|/ |/
o 0: d681519c3ea7 '0' o 0: d681519c3ea7 '0'
$ hg up -cr 1 $ hg up -cr 1
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg branch x $ hg branch x
marked working directory as branch x marked working directory as branch x
$ hg rebase -r 3:: -d . $ hg rebase -r 3:: -d .
rebasing 3:76abc1c6f8c7 "b1" rebasing 3:76abc1c6f8c7 "b1"
rebasing 4:8427af5d86f2 "c2 closed" (tip) rebasing 4:8427af5d86f2 "c2 closed" (tip)
note: rebase of 4:8427af5d86f2 "c2 closed" (tip) created no changes to commit note: not rebasing 4:8427af5d86f2 "c2 closed" (tip), its destination already has all its changes
saved backup bundle to $TESTTMP/case2/.hg/strip-backup/76abc1c6f8c7-cd698d13-rebase.hg saved backup bundle to $TESTTMP/case2/.hg/strip-backup/76abc1c6f8c7-cd698d13-rebase.hg
$ hg tglog $ hg tglog
o 3: 117b0ed08075 'b1' x o 3: 117b0ed08075 'b1' x
| |
| o 2: c062e3ecd6c6 'c1' c | o 2: c062e3ecd6c6 'c1' c
| | | |
@ | 1: 792845bb77ee 'b2' b @ | 1: 792845bb77ee 'b2' b
|/ |/
o 0: d681519c3ea7 '0' o 0: d681519c3ea7 '0'
$ cd .. $ cd ..

tests/test-rebase-newancestor.t

$ hg clone -qU . ../ancestor-merge-2 $ hg clone -qU . ../ancestor-merge-2
Full rebase all the way back from branching point: Full rebase all the way back from branching point:
$ hg rebase -r 'only(dev,default)' -d default --config ui.interactive=True << EOF $ hg rebase -r 'only(dev,default)' -d default --config ui.interactive=True << EOF
> c > c
> EOF > EOF
rebasing 1:1d1a643d390e "dev: create branch" rebasing 1:1d1a643d390e "dev: create branch"
note: rebase of 1:1d1a643d390e "dev: create branch" created no changes to commit note: not rebasing 1:1d1a643d390e "dev: create branch", its destination already has all its changes
rebasing 2:ec2c14fb2984 "dev: f-dev stuff" rebasing 2:ec2c14fb2984 "dev: f-dev stuff"
rebasing 4:4b019212aaf6 "dev: merge default" rebasing 4:4b019212aaf6 "dev: merge default"
file 'f-default' was deleted in local [dest] but was modified in other [source]. file 'f-default' was deleted in local [dest] but was modified in other [source].
What do you want to do? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
rebasing 6:9455ee510502 "dev: merge default" rebasing 6:9455ee510502 "dev: merge default"
saved backup bundle to $TESTTMP/ancestor-merge/.hg/strip-backup/1d1a643d390e-43e9e04b-rebase.hg saved backup bundle to $TESTTMP/ancestor-merge/.hg/strip-backup/1d1a643d390e-43e9e04b-rebase.hg
$ hg tglog $ hg tglog

tests/test-rebase-obsolete.t

We make a copy of both the first changeset in the rebased and some other in the We make a copy of both the first changeset in the rebased and some other in the
set. set.
$ hg graft 42ccdea3bb16 32af7686d403 $ hg graft 42ccdea3bb16 32af7686d403
grafting 1:42ccdea3bb16 "B" grafting 1:42ccdea3bb16 "B"
grafting 3:32af7686d403 "D" grafting 3:32af7686d403 "D"
$ hg rebase -s 42ccdea3bb16 -d . $ hg rebase -s 42ccdea3bb16 -d .
rebasing 1:42ccdea3bb16 "B" rebasing 1:42ccdea3bb16 "B"
note: rebase of 1:42ccdea3bb16 "B" created no changes to commit note: not rebasing 1:42ccdea3bb16 "B", its destination already has all its changes
rebasing 2:5fddd98957c8 "C" rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D" rebasing 3:32af7686d403 "D"
note: rebase of 3:32af7686d403 "D" created no changes to commit note: not rebasing 3:32af7686d403 "D", its destination already has all its changes
$ hg log -G $ hg log -G
o 10:5ae4c968c6ac C o 10:5ae4c968c6ac C
| |
@ 9:08483444fef9 D @ 9:08483444fef9 D
| |
o 8:8877864f1edb B o 8:8877864f1edb B
| |
| o 7:02de42196ebe H | o 7:02de42196ebe H
> A > A
> EOF > EOF
1 new orphan changesets 1 new orphan changesets
$ hg rebase -d C -b F $ hg rebase -d C -b F
rebasing 2:b18e25de2cf5 "D" (D) rebasing 2:b18e25de2cf5 "D" (D)
note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B" (B) note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B" (B)
rebasing 5:66f1a38021c9 "F" (F tip) rebasing 5:66f1a38021c9 "F" (F tip)
note: rebase of 5:66f1a38021c9 "F" (F tip) created no changes to commit note: not rebasing 5:66f1a38021c9 "F" (F tip), its destination already has all its changes
$ hg log -G $ hg log -G
o 6:8f47515dda15 D o 6:8f47515dda15 D
| |
| x 5:66f1a38021c9 F (pruned using rebase) | x 5:66f1a38021c9 F (pruned using rebase)
| |\ | |\
o | | 4:26805aba1e60 C o | | 4:26805aba1e60 C
| | | | | |
| | x 3:7fb047a69f22 E (rewritten using replace as 1:112478962961) | | x 3:7fb047a69f22 E (rewritten using replace as 1:112478962961)
> A > A
> EOF > EOF
1 new orphan changesets 1 new orphan changesets
$ hg rebase -d C -b F $ hg rebase -d C -b F
note: not rebasing 2:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B" (B) note: not rebasing 2:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B" (B)
rebasing 3:7fb047a69f22 "E" (E) rebasing 3:7fb047a69f22 "E" (E)
rebasing 5:66f1a38021c9 "F" (F tip) rebasing 5:66f1a38021c9 "F" (F tip)
note: rebase of 5:66f1a38021c9 "F" (F tip) created no changes to commit note: not rebasing 5:66f1a38021c9 "F" (F tip), its destination already has all its changes
$ hg log -G $ hg log -G
o 6:533690786a86 E o 6:533690786a86 E
| |
| x 5:66f1a38021c9 F (pruned using rebase) | x 5:66f1a38021c9 F (pruned using rebase)
| |\ | |\
o | | 4:26805aba1e60 C o | | 4:26805aba1e60 C
| | | | | |

tests/test-rebase-parameters.t

$ cd .. $ cd ..
$ hg clone -q -u . b b1 $ hg clone -q -u . b b1
$ cd b1 $ cd b1
$ hg rebase -s 2 -d 1 --tool internal:local $ hg rebase -s 2 -d 1 --tool internal:local
rebasing 2:e4e3f3546619 "c2b" (tip) rebasing 2:e4e3f3546619 "c2b" (tip)
note: rebase of 2:e4e3f3546619 "c2b" (tip) created no changes to commit note: not rebasing 2:e4e3f3546619 "c2b" (tip), its destination already has all its changes
saved backup bundle to $TESTTMP/b1/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg saved backup bundle to $TESTTMP/b1/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg
$ hg cat c2 $ hg cat c2
c2 c2
$ cd .. $ cd ..
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg graft --continue $ hg graft --continue
abort: no graft in progress abort: no graft in progress
(continue: hg rebase --continue) (continue: hg rebase --continue)
[255] [255]
$ hg rebase -c --tool internal:fail $ hg rebase -c --tool internal:fail
rebasing 2:e4e3f3546619 "c2b" (tip) rebasing 2:e4e3f3546619 "c2b" (tip)
note: rebase of 2:e4e3f3546619 "c2b" (tip) created no changes to commit note: not rebasing 2:e4e3f3546619 "c2b" (tip), its destination already has all its changes
saved backup bundle to $TESTTMP/b3/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg saved backup bundle to $TESTTMP/b3/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg
$ hg rebase -i $ hg rebase -i
abort: interactive history editing is supported by the 'histedit' extension (see "hg --config extensions.histedit= help -e histedit") abort: interactive history editing is supported by the 'histedit' extension (see "hg --config extensions.histedit= help -e histedit")
[255] [255]
$ hg rebase --interactive $ hg rebase --interactive
abort: interactive history editing is supported by the 'histedit' extension (see "hg --config extensions.histedit= help -e histedit") abort: interactive history editing is supported by the 'histedit' extension (see "hg --config extensions.histedit= help -e histedit")

tests/test-rebase-scenario-global.t

$ hg clone -q -u . a a3 $ hg clone -q -u . a a3
$ cd a3 $ cd a3
$ hg cat -r 4 E | tee E $ hg cat -r 4 E | tee E
E E
$ hg rebase -s 4 -d 7 $ hg rebase -s 4 -d 7
rebasing 4:9520eea781bc "E" rebasing 4:9520eea781bc "E"
rebasing 6:eea13746799a "G" rebasing 6:eea13746799a "G"
note: rebase of 6:eea13746799a "G" created no changes to commit note: not rebasing 6:eea13746799a "G", its destination already has all its changes
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-fcd8edd4-rebase.hg saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-fcd8edd4-rebase.hg
$ f E.orig $ f E.orig
E.orig: file not found E.orig: file not found
$ hg tglog $ hg tglog
o 6: 9f8b8ec77260 'E' o 6: 9f8b8ec77260 'E'
| |
@ 5: 02de42196ebe 'H' @ 5: 02de42196ebe 'H'
F onto E - rebase of a branching point (skip G): F onto E - rebase of a branching point (skip G):
$ hg clone -q -u . a a4 $ hg clone -q -u . a a4
$ cd a4 $ cd a4
$ hg rebase -s 5 -d 4 $ hg rebase -s 5 -d 4
rebasing 5:24b6387c8c8c "F" rebasing 5:24b6387c8c8c "F"
rebasing 6:eea13746799a "G" rebasing 6:eea13746799a "G"
note: rebase of 6:eea13746799a "G" created no changes to commit note: not rebasing 6:eea13746799a "G", its destination already has all its changes
rebasing 7:02de42196ebe "H" (tip) rebasing 7:02de42196ebe "H" (tip)
saved backup bundle to $TESTTMP/a4/.hg/strip-backup/24b6387c8c8c-c3fe765d-rebase.hg saved backup bundle to $TESTTMP/a4/.hg/strip-backup/24b6387c8c8c-c3fe765d-rebase.hg
$ hg tglog $ hg tglog
@ 6: e9240aeaa6ad 'H' @ 6: e9240aeaa6ad 'H'
| |
o 5: 5d0ccadb6e3e 'F' o 5: 5d0ccadb6e3e 'F'
| |

tests/test-remotefilelog-linknodes.t

$ echo x >> x $ echo x >> x
$ hg commit -Aqm xx2 $ hg commit -Aqm xx2
$ echo y >> x $ echo y >> x
$ hg commit -Aqm xxy $ hg commit -Aqm xxy
$ hg pull -q $ hg pull -q
$ hg rebase -d tip $ hg rebase -d tip
rebasing 1:4549721d828f "xx2" rebasing 1:4549721d828f "xx2"
note: rebase of 1:4549721d828f "xx2" created no changes to commit note: not rebasing 1:4549721d828f "xx2", its destination already has all its changes
rebasing 2:5ef6d97e851c "xxy" rebasing 2:5ef6d97e851c "xxy"
saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/4549721d828f-b084e33c-rebase.hg (glob) saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/4549721d828f-b084e33c-rebase.hg (glob)
$ hg log -f x --template '{node|short}\n' $ hg log -f x --template '{node|short}\n'
4ae8e31c85ef 4ae8e31c85ef
0632994590a8 0632994590a8
b292c1e3311f b292c1e3311f
$ cd .. $ cd ..