This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9252

rebase: change and standarize template for rebase's one-line summary
ClosedPublic

Authored by martinvonz on Oct 27 2020, 6:42 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGf90a5c211251: rebase: change and standarize template for rebase's one-line summary
Summary

This removes the default template in rebase and switches to a
centrally defined template. I've simplified it a bit to avoid the
conditional parenthesis. I've also added labels so the different parts
can be easily colored. The template is somewhat similar to what we've
used internally at Google for a few years.

I'm happy to change the template if others have opinions. Should we
reuse the color.log. names as I have?

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.Oct 27 2020, 6:42 PM
martinvonz edited the summary of this revision. (Show Details)Oct 27 2020, 6:44 PM
martinvonz added a commit: rHGf90a5c211251: rebase: change and standarize template for rebase's one-line summary.Oct 28 2020, 9:50 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGf90a5c211251: rebase: change and standarize template for rebase's one-line summary (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.
martinvonz added inline comments.Oct 29 2020, 11:07 AM
mercurial/cmdutil.py
1229–1231

I left out branches and custom namespaces on purpose because I figured people like us (Google) who have custom namespaces can also have custom configs. However, I just realized that this makes everyone with the topic extension lose the topic they've had in rebase output for a long time (ever since someone was nice enough to add it in D741). I'll send a follow-up to include names from all non-branch namespaces. Sorry about the churn that that will incur.

martinvonz added inline comments.Oct 29 2020, 12:07 PM
mercurial/cmdutil.py
1229–1231

I sent D9262 to fix that.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (7 lines)
Mmercurial/cmdutil.py (12 lines)
Mtests/test-absorb-unfinished.t (2 lines)
Mtests/test-audit-path.t (2 lines)
Mtests/test-bookmarks-rebase.t (6 lines)
Mtests/test-copies-in-changeset.t (2 lines)
Mtests/test-copies.t (4 lines)
Mtests/test-copy-move-merge.t (6 lines)
Mtests/test-copytrace-heuristics.t (26 lines)
Mtests/test-dirstate-race.t (2 lines)
Mtests/test-fix.t (2 lines)
Mtests/test-infinitepush-ci.t (2 lines)
Mtests/test-largefiles-update.t (2 lines)
Mtests/test-narrow-copies.t (2 lines)
Mtests/test-narrow-rebase.t (8 lines)
Mtests/test-obsmarkers-effectflag.t (2 lines)
Mtests/test-rebase-abort.t (10 lines)
Mtests/test-rebase-base-flag.t (86 lines)
Mtests/test-rebase-bookmarks.t (20 lines)
Mtests/test-rebase-cache.t (6 lines)
Mtests/test-rebase-check-restore.t (4 lines)
Mtests/test-rebase-collapse.t (64 lines)
Mtests/test-rebase-conflicts.t (30 lines)
Mtests/test-rebase-dest.t (82 lines)
Mtests/test-rebase-detach.t (32 lines)
Mtests/test-rebase-empty-successor.t (8 lines)
Mtests/test-rebase-emptycommit.t (46 lines)
Mtests/test-rebase-inmemory.t (30 lines)
Mtests/test-rebase-interruptions.t (10 lines)
Mtests/test-rebase-legacy.t (10 lines)
Mtests/test-rebase-mq-skip.t (34 lines)
Mtests/test-rebase-mq.t (16 lines)
Mtests/test-rebase-named-branches.t (18 lines)
Mtests/test-rebase-newancestor.t (22 lines)
Mtests/test-rebase-obsolete.t (134 lines)
Mtests/test-rebase-parameters.t (12 lines)
Mtests/test-rebase-partial.t (14 lines)
Mtests/test-rebase-rename.t (10 lines)
Mtests/test-rebase-scenario-global.t (28 lines)
Mtests/test-rebase-transaction.t (22 lines)
Mtests/test-remotefilelog-bgprefetch.t (2 lines)
Mtests/test-remotefilelog-linknodes.t (6 lines)
Mtests/test-remotefilelog-sparse.t (2 lines)
Mtests/test-shelve2.t (2 lines)
Mtests/test-sparse.t (4 lines)
Mtests/test-split.t (6 lines)

Diff 23325

hgext/rebase.py

% (src, dests) % (src, dests)
) )
# We have zero or one destination, so we can just return here. # We have zero or one destination, so we can just return here.
return smartset.baseset(dests) return smartset.baseset(dests)
def _ctxdesc(ctx): def _ctxdesc(ctx):
"""short description for a context""" """short description for a context"""
labels_spec = b'join(filter(namespaces % "{ifeq(namespace, "branches", "", join(names, " "))}"), " ")'
spec = b'{rev}:{node|short} "{desc|firstline}"{if(%s, " ({%s})")}' % (
labels_spec,
labels_spec,
)
return cmdutil.format_changeset_summary( return cmdutil.format_changeset_summary(
ctx.repo().ui, ctx, command=b'rebase', default_spec=spec ctx.repo().ui, ctx, command=b'rebase'
) )
class rebaseruntime(object): class rebaseruntime(object):
"""This class is a container for rebase runtime state""" """This class is a container for rebase runtime state"""
def __init__(self, repo, ui, inmemory=False, dryrun=False, opts=None): def __init__(self, repo, ui, inmemory=False, dryrun=False, opts=None):
if opts is None: if opts is None:

mercurial/cmdutil.py

spec = ui.config( spec = ui.config(
b'command-templates', b'oneline-summary.%s' % command, None b'command-templates', b'oneline-summary.%s' % command, None
) )
if not spec: if not spec:
spec = ui.config(b'command-templates', b'oneline-summary') spec = ui.config(b'command-templates', b'oneline-summary')
if not spec: if not spec:
spec = default_spec spec = default_spec
if not spec: if not spec:
# TODO: Pick a default we can agree on. This isn't used yet. spec = (
raise error.ProgrammingError(b"no default one-line summary defined yet") b'{separate(" ", '
b'label("log.changeset", "{rev}:{node|short}")'
b', '
b'label("log.tag", tags)'
b', '
b'label("log.bookmark", bookmarks)'
martinvonzAuthorUnsubmitted
Done

I left out branches and custom namespaces on purpose because I figured people like us (Google) who have custom namespaces can also have custom configs. However, I just realized that this makes everyone with the topic extension lose the topic they've had in rebase output for a long time (ever since someone was nice enough to add it in D741). I'll send a follow-up to include names from all non-branch namespaces. Sorry about the churn that that will incur.

martinvonz: I left out branches and custom namespaces on purpose because I figured people like us (Google)…
martinvonzAuthorUnsubmitted
Done

I sent D9262 to fix that.

martinvonz: I sent D9262 to fix that.
b')} '
b'"{label("log.desc", desc|firstline)}"'
)
text = rendertemplate(ctx, spec) text = rendertemplate(ctx, spec)
return text.split(b'\n')[0] return text.split(b'\n')[0]
def _buildfntemplate(pat, total=None, seqno=None, revwidth=None, pathname=None): def _buildfntemplate(pat, total=None, seqno=None, revwidth=None, pathname=None):
r"""Convert old-style filename format string to template string r"""Convert old-style filename format string to template string
>>> _buildfntemplate(b'foo-%b-%n.patch', seqno=0) >>> _buildfntemplate(b'foo-%b-%n.patch', seqno=0)

tests/test-absorb-unfinished.t

$ hg commit -Aqm "foo 1" $ hg commit -Aqm "foo 1"
$ hg update null $ hg update null
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo "foo2" > foo.whole $ echo "foo2" > foo.whole
$ hg commit -Aqm "foo 2" $ hg commit -Aqm "foo 2"
$ hg --config extensions.rebase= rebase -r 1 -d 0 $ hg --config extensions.rebase= rebase -r 1 -d 0
rebasing 1:c3b6dc0e177a "foo 2" (tip) rebasing 1:c3b6dc0e177a tip "foo 2"
merging foo.whole merging foo.whole
warning: conflicts while merging foo.whole! (edit, then use 'hg resolve --mark') warning: conflicts while merging foo.whole! (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 --config extensions.rebase= absorb $ hg --config extensions.rebase= absorb
abort: rebase in progress abort: rebase in progress
(use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')
[255] [255]

tests/test-audit-path.t

abort: path 'a/poisoned' traverses symbolic link 'a' abort: path 'a/poisoned' traverses symbolic link 'a'
[255] [255]
try rebase onto other revision: cache of audited paths should be discarded, try rebase onto other revision: cache of audited paths should be discarded,
and the rebase should fail (issue5628) and the rebase should fail (issue5628)
$ hg up -qC 2 $ hg up -qC 2
$ hg rebase -s 2 -d 1 --config extensions.rebase= $ hg rebase -s 2 -d 1 --config extensions.rebase=
rebasing 2:e73c21d6b244 "file a/poisoned" (tip) rebasing 2:e73c21d6b244 tip "file a/poisoned"
abort: path 'a/poisoned' traverses symbolic link 'a' abort: path 'a/poisoned' traverses symbolic link 'a'
[255] [255]
$ ls ../merge-symlink-out $ ls ../merge-symlink-out
$ cd .. $ cd ..
Test symlink traversal on update: Test symlink traversal on update:
--------------------------------- ---------------------------------

tests/test-bookmarks-rebase.t

$ hg bookmark $ hg bookmark
one 1:925d80f479bb one 1:925d80f479bb
* two 3:2ae46b1d99a7 * two 3:2ae46b1d99a7
rebase rebase
$ hg rebase -s two -d one $ hg rebase -s two -d one
rebasing 3:2ae46b1d99a7 "3" (two tip) rebasing 3:2ae46b1d99a7 tip two "3"
saved backup bundle to $TESTTMP/.hg/strip-backup/2ae46b1d99a7-e6b057bc-rebase.hg saved backup bundle to $TESTTMP/.hg/strip-backup/2ae46b1d99a7-e6b057bc-rebase.hg
$ hg log $ hg log
changeset: 3:42e5ed2cdcf4 changeset: 3:42e5ed2cdcf4
bookmark: two bookmark: two
tag: tip tag: tip
parent: 1:925d80f479bb parent: 1:925d80f479bb
user: test user: test
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(leaving bookmark two) (leaving bookmark two)
$ echo 'e' > d $ echo 'e' > d
$ hg ci -A -m "4" $ hg ci -A -m "4"
adding d adding d
created new head created new head
$ hg bookmark three $ hg bookmark three
$ hg rebase -s three -d two $ hg rebase -s three -d two
rebasing 4:dd7c838e8362 "4" (three tip) rebasing 4:dd7c838e8362 tip three "4"
merging d merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark') warning: conflicts while merging d! (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
$ hg bookmark $ hg bookmark
one 1:925d80f479bb one 1:925d80f479bb
* three 4:dd7c838e8362 * three 4:dd7c838e8362
two 3:42e5ed2cdcf4 two 3:42e5ed2cdcf4
after aborted rebase, restoring a bookmark that has been removed should not fail after aborted rebase, restoring a bookmark that has been removed should not fail
$ hg rebase -s three -d two $ hg rebase -s three -d two
rebasing 4:dd7c838e8362 "4" (three tip) rebasing 4:dd7c838e8362 tip three "4"
merging d merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark') warning: conflicts while merging d! (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 bookmark -d three $ hg bookmark -d three
$ hg rebase --abort $ hg rebase --abort
rebase aborted rebase aborted
$ hg bookmark $ hg bookmark
one 1:925d80f479bb one 1:925d80f479bb
two 3:42e5ed2cdcf4 two 3:42e5ed2cdcf4

tests/test-copies-in-changeset.t

$ echo a > a $ echo a > a
$ hg ci -Aqm 'add a' $ hg ci -Aqm 'add a'
$ echo a2 > a $ echo a2 > a
$ hg ci -m 'modify a' $ hg ci -m 'modify a'
$ hg co -q 0 $ hg co -q 0
$ hg mv a b $ hg mv a b
$ hg ci -qm 'rename a to b' $ hg ci -qm 'rename a to b'
$ hg rebase -d 1 --config rebase.experimental.inmemory=yes $ hg rebase -d 1 --config rebase.experimental.inmemory=yes
rebasing 2:* "rename a to b" (tip) (glob) rebasing 2:* tip "rename a to b" (glob)
merging a and b to b merging a and b to b
saved backup bundle to $TESTTMP/rebase-rename/.hg/strip-backup/*-*-rebase.hg (glob) saved backup bundle to $TESTTMP/rebase-rename/.hg/strip-backup/*-*-rebase.hg (glob)
$ hg st --change . --copies $ hg st --change . --copies
A b A b
a a
R a R a
$ cd .. $ cd ..

tests/test-copies.t

| o 2 added willconflict | o 2 added willconflict
|/ willconflict |/ willconflict
o 1 added b o 1 added b
| b | b
o 0 added a o 0 added a
a a
$ hg rebase -r . -d 2 -t :other $ hg rebase -r . -d 2 -t :other
rebasing 5:5018b1509e94 "added willconflict and d" (tip) (no-changeset !) rebasing 5:5018b1509e94 tip "added willconflict and d" (no-changeset !)
rebasing 5:af8d273bf580 "added willconflict and d" (tip) (changeset !) rebasing 5:af8d273bf580 tip "added willconflict and d" (changeset !)
$ hg up 3 -q $ hg up 3 -q
$ hg l --hidden $ hg l --hidden
o 6 added willconflict and d o 6 added willconflict and d
| d willconflict | d willconflict
| x 5 added willconflict and d | x 5 added willconflict and d
| | d willconflict | | d willconflict
| | x 4 added d | | x 4 added d

tests/test-copy-move-merge.t

Test disabling copy tracing Test disabling copy tracing
=========================== ===========================
first verify copy metadata was kept first verify copy metadata was kept
----------------------------------- -----------------------------------
$ hg up -qC 2 $ hg up -qC 2
$ hg rebase --keep -d 1 -b 2 --config extensions.rebase= $ hg rebase --keep -d 1 -b 2 --config extensions.rebase=
rebasing 2:add3f11052fa "other" (tip) rebasing 2:add3f11052fa tip "other"
merging b and a to b merging b and a to b
merging c and a to c merging c and a to c
$ cat b $ cat b
0 0
1 1
2 2
next verify copy metadata is lost when disabled next verify copy metadata is lost when disabled
------------------------------------------------ ------------------------------------------------
$ hg strip -r . --config extensions.strip= $ hg strip -r . --config extensions.strip=
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/t/.hg/strip-backup/550bd84c0cd3-fc575957-backup.hg saved backup bundle to $TESTTMP/t/.hg/strip-backup/550bd84c0cd3-fc575957-backup.hg
$ hg up -qC 2 $ hg up -qC 2
$ hg rebase --keep -d 1 -b 2 --config extensions.rebase= --config experimental.copytrace=off --config ui.interactive=True << EOF $ hg rebase --keep -d 1 -b 2 --config extensions.rebase= --config experimental.copytrace=off --config ui.interactive=True << EOF
> c > c
> EOF > EOF
rebasing 2:add3f11052fa "other" (tip) rebasing 2:add3f11052fa tip "other"
file 'a' was deleted in local [dest] but was modified in other [source]. file 'a' was deleted in local [dest] but was modified in other [source].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? c What do you want to do? c
$ cat b $ cat b
1 1
2 2
Actual Test Actual Test
A file is copied on one side and has been moved twice on the other side. the A file is copied on one side and has been moved twice on the other side. the
file is copied from `0:a`, so the file history of the `3:b` should trace directly to `0:a`. file is copied from `0:a`, so the file history of the `3:b` should trace directly to `0:a`.
$ hg rebase -d 2 -s 3 --config extensions.rebase= --config experimental.copytrace=off $ hg rebase -d 2 -s 3 --config extensions.rebase= --config experimental.copytrace=off
rebasing 3:47e1a9e6273b "copy a->b (2)" (tip) rebasing 3:47e1a9e6273b tip "copy a->b (2)"
saved backup bundle to $TESTTMP/copydisable3/.hg/strip-backup/47e1a9e6273b-2d099c59-rebase.hg saved backup bundle to $TESTTMP/copydisable3/.hg/strip-backup/47e1a9e6273b-2d099c59-rebase.hg
$ hg log -G -f b $ hg log -G -f b
@ changeset: 3:76024fb4b05b @ changeset: 3:76024fb4b05b
: tag: tip : tag: tip
: user: test : user: test
: date: Thu Jan 01 00:00:00 1970 +0000 : date: Thu Jan 01 00:00:00 1970 +0000
: summary: copy a->b (2) : summary: copy a->b (2)
: :
o changeset: 0:ac82d8b1f7c4 o changeset: 0:ac82d8b1f7c4
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: add a summary: add a

tests/test-copytrace-heuristics.t

@ rev: 2 @ rev: 2
| desc: mod a, mod dir/file.txt | desc: mod a, mod dir/file.txt
| o rev: 1 | o rev: 1
|/ desc: mv a b, mv dir/ dir2/ |/ desc: mv a b, mv dir/ dir2/
o rev: 0 o rev: 0
desc: initial desc: initial
$ hg rebase -s . -d 1 $ hg rebase -s . -d 1
rebasing 2:557f403c0afd "mod a, mod dir/file.txt" (tip) rebasing 2:557f403c0afd tip "mod a, mod dir/file.txt"
merging b and a to b merging b and a to b
merging dir2/file.txt and dir/file.txt to dir2/file.txt merging dir2/file.txt and dir/file.txt to dir2/file.txt
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/557f403c0afd-9926eeff-rebase.hg saved backup bundle to $TESTTMP/repo/.hg/strip-backup/557f403c0afd-9926eeff-rebase.hg
$ cd .. $ cd ..
$ rm -rf repo $ rm -rf repo
Make sure filename heuristics do not when they are not related Make sure filename heuristics do not when they are not related
-------------------------------------------------------------- --------------------------------------------------------------
@ rev: 2 @ rev: 2
| desc: mode a | desc: mode a
| o rev: 1 | o rev: 1
|/ desc: rm a, add b |/ desc: rm a, add b
o rev: 0 o rev: 0
desc: initial desc: initial
$ hg rebase -s . -d 1 $ hg rebase -s . -d 1
rebasing 2:d526312210b9 "mode a" (tip) rebasing 2:d526312210b9 tip "mode a"
file 'a' was deleted in local [dest] but was modified in other [source]. file 'a' was deleted in local [dest] but was modified in other [source].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u What do you want to do? u
unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1] [1]
$ cd .. $ cd ..
$ rm -rf repo $ rm -rf repo
| o rev: 2, phase: draft | o rev: 2, phase: draft
|/ desc: mv a b |/ desc: mv a b
o rev: 1, phase: draft o rev: 1, phase: draft
| desc: randomcommit | desc: randomcommit
o rev: 0, phase: draft o rev: 0, phase: draft
desc: initial desc: initial
$ hg rebase -s . -d 2 $ hg rebase -s . -d 2
rebasing 3:9d5cf99c3d9f "mod a" (tip) rebasing 3:9d5cf99c3d9f tip "mod a"
merging b and a to b merging b and a to b
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9d5cf99c3d9f-f02358cc-rebase.hg saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9d5cf99c3d9f-f02358cc-rebase.hg
$ cd .. $ cd ..
$ rm -rf repo $ rm -rf repo
Rebase "backwards" Rebase "backwards"
------------------ ------------------
o rev: 2 o rev: 2
| desc: mv a b | desc: mv a b
o rev: 1 o rev: 1
| desc: randomcommit | desc: randomcommit
o rev: 0 o rev: 0
desc: initial desc: initial
$ hg rebase -s . -d 0 $ hg rebase -s . -d 0
rebasing 3:fbe97126b396 "mod b" (tip) rebasing 3:fbe97126b396 tip "mod b"
merging a and b to a merging a and b to a
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fbe97126b396-cf5452a1-rebase.hg saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fbe97126b396-cf5452a1-rebase.hg
$ cd .. $ cd ..
$ rm -rf repo $ rm -rf repo
Check a few potential move candidates Check a few potential move candidates
------------------------------------- -------------------------------------
| o rev: 2 | o rev: 2
| | desc: create dir2/a | | desc: create dir2/a
| o rev: 1 | o rev: 1
|/ desc: mv dir/a dir/b |/ desc: mv dir/a dir/b
o rev: 0 o rev: 0
desc: initial desc: initial
$ hg rebase -s . -d 2 $ hg rebase -s . -d 2
rebasing 3:6b2f4cece40f "mod dir/a" (tip) rebasing 3:6b2f4cece40f tip "mod dir/a"
merging dir/b and dir/a to dir/b merging dir/b and dir/a to dir/b
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/6b2f4cece40f-503efe60-rebase.hg saved backup bundle to $TESTTMP/repo/.hg/strip-backup/6b2f4cece40f-503efe60-rebase.hg
$ cd .. $ cd ..
$ rm -rf repo $ rm -rf repo
Test the copytrace.movecandidateslimit with many move candidates Test the copytrace.movecandidateslimit with many move candidates
---------------------------------------------------------------- ----------------------------------------------------------------
| o rev: 1 | o rev: 1
|/ desc: mv a foo, add many files |/ desc: mv a foo, add many files
o rev: 0 o rev: 0
desc: initial desc: initial
With small limit With small limit
$ hg rebase -s 2 -d 1 --config experimental.copytrace.movecandidateslimit=0 $ hg rebase -s 2 -d 1 --config experimental.copytrace.movecandidateslimit=0
rebasing 2:ef716627c70b "mod a" (tip) rebasing 2:ef716627c70b tip "mod a"
skipping copytracing for 'a', more candidates than the limit: 7 skipping copytracing for 'a', more candidates than the limit: 7
file 'a' was deleted in local [dest] but was modified in other [source]. file 'a' was deleted in local [dest] but was modified in other [source].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u What do you want to do? u
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
With default limit which is 100 With default limit which is 100
$ hg rebase -s 2 -d 1 $ hg rebase -s 2 -d 1
rebasing 2:ef716627c70b "mod a" (tip) rebasing 2:ef716627c70b tip "mod a"
merging foo and a to foo merging foo and a to foo
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg saved backup bundle to $TESTTMP/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg
$ cd .. $ cd ..
$ rm -rf repo $ rm -rf repo
Move file in one branch and delete it in another Move file in one branch and delete it in another
----------------------------------------------- -----------------------------------------------
@ rev: 2 @ rev: 2
| desc: mv dir/ dir2/ | desc: mv dir/ dir2/
| o rev: 1 | o rev: 1
|/ desc: mod dir/a |/ desc: mod dir/a
o rev: 0 o rev: 0
desc: initial desc: initial
$ hg rebase -s . -d 1 $ hg rebase -s . -d 1
rebasing 2:a33d80b6e352 "mv dir/ dir2/" (tip) rebasing 2:a33d80b6e352 tip "mv dir/ dir2/"
merging dir/a and dir2/a to dir2/a merging dir/a and dir2/a to dir2/a
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a33d80b6e352-fecb9ada-rebase.hg saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a33d80b6e352-fecb9ada-rebase.hg
$ cd .. $ cd ..
$ rm -rf server $ rm -rf server
$ rm -rf repo $ rm -rf repo
Move file twice and rebase mod on top of moves Move file twice and rebase mod on top of moves
---------------------------------------------- ----------------------------------------------
| desc: mod a | desc: mod a
| o rev: 2 | o rev: 2
| | desc: mv b c | | desc: mv b c
| o rev: 1 | o rev: 1
|/ desc: mv a b |/ desc: mv a b
o rev: 0 o rev: 0
desc: initial desc: initial
$ hg rebase -s . -d 2 $ hg rebase -s . -d 2
rebasing 3:d41316942216 "mod a" (tip) rebasing 3:d41316942216 tip "mod a"
merging c and a to c merging c and a to c
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d41316942216-2b5949bc-rebase.hg saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d41316942216-2b5949bc-rebase.hg
$ cd .. $ cd ..
$ rm -rf repo $ rm -rf repo
Move file twice and rebase moves on top of mods Move file twice and rebase moves on top of mods
----------------------------------------------- -----------------------------------------------
| o rev: 2 | o rev: 2
| | desc: add c | | desc: add c
| o rev: 1 | o rev: 1
|/ desc: mv a b |/ desc: mv a b
o rev: 0 o rev: 0
desc: initial desc: initial
$ hg rebase -s . -d 2 $ hg rebase -s . -d 2
rebasing 3:ef716627c70b "mod a" (tip) rebasing 3:ef716627c70b tip "mod a"
merging b and a to b merging b and a to b
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg saved backup bundle to $TESTTMP/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg
$ ls -A $ ls -A
.hg .hg
b b
c c
$ cat b $ cat b
b b
@ rev: 2 @ rev: 2
| desc: mod a | desc: mod a
| o rev: 1 | o rev: 1
|/ desc: cp a c, mv a b |/ desc: cp a c, mv a b
o rev: 0 o rev: 0
desc: initial desc: initial
$ hg rebase -s . -d 1 $ hg rebase -s . -d 1
rebasing 2:ef716627c70b "mod a" (tip) rebasing 2:ef716627c70b tip "mod a"
merging b and a to b merging b and a to b
merging c and a to c merging c and a to c
saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg
$ ls -A $ ls -A
.hg .hg
b b
c c
$ cat b $ cat b
@ rev: 2, phase: draft @ rev: 2, phase: draft
| desc: mod a | desc: mod a
| o rev: 1, phase: draft | o rev: 1, phase: draft
|/ desc: mv a b; mv dir1 dir2 |/ desc: mv a b; mv dir1 dir2
o rev: 0, phase: draft o rev: 0, phase: draft
desc: initial desc: initial
$ hg rebase -s . -d 1 --config experimental.copytrace.sourcecommitlimit=100 $ hg rebase -s . -d 1 --config experimental.copytrace.sourcecommitlimit=100
rebasing 2:6207d2d318e7 "mod a" (tip) rebasing 2:6207d2d318e7 tip "mod a"
merging dir2/b and dir1/a to dir2/b merging dir2/b and dir1/a to dir2/b
saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/6207d2d318e7-1c9779ad-rebase.hg saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/6207d2d318e7-1c9779ad-rebase.hg
$ cat dir2/b $ cat dir2/b
a a
b b
$ cd .. $ cd ..
$ rm -rf repo $ rm -rf repo
@ rev: 2, phase: draft @ rev: 2, phase: draft
| desc: mv dir1 dir2 | desc: mv dir1 dir2
| o rev: 1, phase: draft | o rev: 1, phase: draft
|/ desc: hg add dir1/a |/ desc: hg add dir1/a
o rev: 0, phase: draft o rev: 0, phase: draft
desc: initial desc: initial
$ hg rebase -s . -d 1 --config experimental.copytrace.sourcecommitlimit=100 $ hg rebase -s . -d 1 --config experimental.copytrace.sourcecommitlimit=100
rebasing 2:e8919e7df8d0 "mv dir1 dir2" (tip) rebasing 2:e8919e7df8d0 tip "mv dir1 dir2"
saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/e8919e7df8d0-f62fab62-rebase.hg saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/e8919e7df8d0-f62fab62-rebase.hg
$ ls dir2 $ ls dir2
a a
dummy dummy
$ rm -rf repo $ rm -rf repo
Testing the sourcecommitlimit config Testing the sourcecommitlimit config
----------------------------------- -----------------------------------

tests/test-dirstate-race.t

> [extensions] > [extensions]
> rebase = > rebase =
> [merge-tools] > [merge-tools]
> test.executable=sh > test.executable=sh
> test.args=$TESTTMP/mergetool-race.sh \$output > test.args=$TESTTMP/mergetool-race.sh \$output
> EOF > EOF
$ hg rebase -s . -d 3 --tool test $ hg rebase -s . -d 3 --tool test
rebasing 4:b08445fd6b2a "c4" (tip) rebasing 4:b08445fd6b2a tip "c4"
merging a merging a
custom merge tool custom merge tool
custom merge tool end custom merge tool end
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/* (glob) saved backup bundle to $TESTTMP/repo/.hg/strip-backup/* (glob)
This hg status should be empty, whether or not fsmonitor is enabled (issue5581). This hg status should be empty, whether or not fsmonitor is enabled (issue5581).
$ hg status $ hg status

tests/test-fix.t

$ hg commit -Aqm "foo 1" $ hg commit -Aqm "foo 1"
$ hg update null $ hg update null
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo "foo2" > foo.whole $ echo "foo2" > foo.whole
$ hg commit -Aqm "foo 2" $ hg commit -Aqm "foo 2"
$ hg --config extensions.rebase= rebase -r 1 -d 0 $ hg --config extensions.rebase= rebase -r 1 -d 0
rebasing 1:c3b6dc0e177a "foo 2" (tip) rebasing 1:c3b6dc0e177a tip "foo 2"
merging foo.whole merging foo.whole
warning: conflicts while merging foo.whole! (edit, then use 'hg resolve --mark') warning: conflicts while merging foo.whole! (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 --config extensions.rebase= fix --working-dir $ hg --config extensions.rebase= fix --working-dir
abort: unresolved conflicts abort: unresolved conflicts
(use 'hg resolve') (use 'hg resolve')

tests/test-infinitepush-ci.t

> [extensions] > [extensions]
> rebase = > rebase =
> EOF > EOF
$ cd ../client $ cd ../client
$ hg phase -r . --draft --force $ hg phase -r . --draft --force
$ hg rebase -r 6 -d 3 $ hg rebase -r 6 -d 3
rebasing 6:9b42578d4447 "added f" (tip) rebasing 6:9b42578d4447 tip "added f"
$ hg glog $ hg glog
@ 7:99949238d9ac added f @ 7:99949238d9ac added f
| draft | draft
| o 5:b4e4bce66051 added e | o 5:b4e4bce66051 added e
| | public | | public
| o 4:1bb96358eda2 added d | o 4:1bb96358eda2 added d
|/ public |/ public

tests/test-largefiles-update.t

$ hg update -q -C 1 $ hg update -q -C 1
$ hg remove large1 $ hg remove large1
$ echo largeX > largeX $ echo largeX > largeX
$ hg add --large largeX $ hg add --large largeX
$ hg commit -m '#4' $ hg commit -m '#4'
$ hg rebase -s 1 -d 2 --keep $ hg rebase -s 1 -d 2 --keep
rebasing 1:72518492caa6 "#1" rebasing 1:72518492caa6 "#1"
rebasing 4:07d6153b5c04 "#4" (tip) rebasing 4:07d6153b5c04 tip "#4"
$ hg status -A large1 $ hg status -A large1
large1: $ENOENT$ large1: $ENOENT$
$ hg status -A largeX $ hg status -A largeX
C largeX C largeX
$ hg strip -q 5 $ hg strip -q 5

tests/test-narrow-copies.t

saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/4f84b666728c-4269b76e-rebase.hg saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/4f84b666728c-4269b76e-rebase.hg
$ hg co -q 0 $ hg co -q 0
$ echo modified > inside/f1 $ echo modified > inside/f1
$ hg ci -qm 'modify inside/f1' $ hg ci -qm 'modify inside/f1'
$ echo new > inside/f5 $ echo new > inside/f5
$ hg ci -Aqm 'add inside/f5' $ hg ci -Aqm 'add inside/f5'
$ hg --config extensions.rebase= rebase -d 'public()' -r . $ hg --config extensions.rebase= rebase -d 'public()' -r .
rebasing 6:610b60178c28 "add inside/f5" (tip) rebasing 6:610b60178c28 tip "add inside/f5"
saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/610b60178c28-65716a78-rebase.hg saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/610b60178c28-65716a78-rebase.hg

tests/test-narrow-rebase.t

$ hg update -q 0 $ hg update -q 0
Can rebase onto commit where no files outside narrow spec are involved Can rebase onto commit where no files outside narrow spec are involved
$ hg update -q 0 $ hg update -q 0
$ echo modified > inside/f2 $ echo modified > inside/f2
$ hg ci -qm 'modify inside/f2' $ hg ci -qm 'modify inside/f2'
$ hg rebase -d 'desc("modify inside/f1")' $ hg rebase -d 'desc("modify inside/f1")'
rebasing 5:c2f36d04e05d "modify inside/f2" (tip) rebasing 5:c2f36d04e05d tip "modify inside/f2"
saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-rebase.hg (glob) saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-rebase.hg (glob)
Can rebase onto conflicting changes inside narrow spec Can rebase onto conflicting changes inside narrow spec
$ hg update -q 0 $ hg update -q 0
$ echo conflicting > inside/f1 $ echo conflicting > inside/f1
$ hg ci -qm 'conflicting inside/f1' $ hg ci -qm 'conflicting inside/f1'
$ hg rebase -d 'desc("modify inside/f1")' 2>&1 | egrep -v '(warning:|incomplete!)' $ hg rebase -d 'desc("modify inside/f1")' 2>&1 | egrep -v '(warning:|incomplete!)'
rebasing 6:cdce97fbf653 "conflicting inside/f1" (tip) rebasing 6:cdce97fbf653 tip "conflicting inside/f1"
merging inside/f1 merging inside/f1
unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
$ echo modified3 > inside/f1 $ echo modified3 > inside/f1
$ hg resolve -m 2>&1 | grep -v continue: $ hg resolve -m 2>&1 | grep -v continue:
(no more unresolved files) (no more unresolved files)
$ hg continue $ hg continue
rebasing 6:cdce97fbf653 "conflicting inside/f1" (tip) rebasing 6:cdce97fbf653 tip "conflicting inside/f1"
saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-rebase.hg (glob) saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-rebase.hg (glob)
Can rebase onto non-conflicting changes outside narrow spec Can rebase onto non-conflicting changes outside narrow spec
$ hg update -q 0 $ hg update -q 0
$ echo modified > inside/f2 $ echo modified > inside/f2
$ hg ci -qm 'modify inside/f2' $ hg ci -qm 'modify inside/f2'
$ hg rebase -d 'desc("modify outside/f1")' $ hg rebase -d 'desc("modify outside/f1")'
rebasing 7:c2f36d04e05d "modify inside/f2" (tip) rebasing 7:c2f36d04e05d tip "modify inside/f2"
saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-rebase.hg (glob) saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-rebase.hg (glob)
Rebase interrupts on conflicting changes outside narrow spec Rebase interrupts on conflicting changes outside narrow spec
$ hg update -q 'desc("conflicting outside/f1")' $ hg update -q 'desc("conflicting outside/f1")'
$ hg phase -f -d . $ hg phase -f -d .
$ hg rebase -d 'desc("modify outside/f1")' $ hg rebase -d 'desc("modify outside/f1")'
rebasing 4:707c035aadb6 "conflicting outside/f1" rebasing 4:707c035aadb6 "conflicting outside/f1"
abort: conflict in file 'outside/f1' is outside narrow clone abort: conflict in file 'outside/f1' is outside narrow clone
[255] [255]

tests/test-obsmarkers-effectflag.t

0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
rebase (parents change) rebase (parents change)
----------------------- -----------------------
$ mkcommit C0 $ mkcommit C0
$ mkcommit D0 $ mkcommit D0
$ hg rebase -r . -d 'desc(B0)' $ hg rebase -r . -d 'desc(B0)'
rebasing 10:c85eff83a034 "D0" (tip) rebasing 10:c85eff83a034 tip "D0"
check result check result
$ hg debugobsolete --rev . $ hg debugobsolete --rev .
c85eff83a0340efd9da52b806a94c350222f3371 da86aa2f19a30d6686b15cae15c7b6c908ec9699 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} c85eff83a0340efd9da52b806a94c350222f3371 da86aa2f19a30d6686b15cae15c7b6c908ec9699 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
amend touching the diff amend touching the diff
----------------------- -----------------------

tests/test-rebase-abort.t

| |
o 0:draft 'C1' o 0:draft 'C1'
Conflicting rebase: Conflicting rebase:
$ hg rebase -s 3 -d 2 $ hg rebase -s 3 -d 2
rebasing 3:3163e20567cc "L1" rebasing 3:3163e20567cc "L1"
rebasing 4:46f0b057b5c0 "L2" (tip) rebasing 4:46f0b057b5c0 tip "L2"
merging common merging common
warning: conflicts while merging common! (edit, then use 'hg resolve --mark') warning: conflicts while merging common! (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]
Insert unsupported advisory merge record: Insert unsupported advisory merge record:
$ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -x $ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -x
o 0:draft 'C1' o 0:draft 'C1'
Test safety for inconsistent rebase state, which may be created (and Test safety for inconsistent rebase state, which may be created (and
forgotten) by Mercurial earlier than 2.7. This emulates Mercurial forgotten) by Mercurial earlier than 2.7. This emulates Mercurial
earlier than 2.7 by renaming ".hg/rebasestate" temporarily. earlier than 2.7 by renaming ".hg/rebasestate" temporarily.
$ hg rebase -s 3 -d 2 $ hg rebase -s 3 -d 2
rebasing 3:3163e20567cc "L1" rebasing 3:3163e20567cc "L1"
rebasing 4:46f0b057b5c0 "L2" (tip) rebasing 4:46f0b057b5c0 tip "L2"
merging common merging common
warning: conflicts while merging common! (edit, then use 'hg resolve --mark') warning: conflicts while merging common! (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]
$ mv .hg/rebasestate .hg/rebasestate.back $ mv .hg/rebasestate .hg/rebasestate.back
$ hg update --quiet --clean 2 $ hg update --quiet --clean 2
$ hg --config extensions.mq= strip --quiet "destination()" $ hg --config extensions.mq= strip --quiet "destination()"
| | | |
| 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: not rebasing 3:a6484957d6b9 "B bis", its destination already has all its changes note: not rebasing 3:a6484957d6b9 "B bis", its destination already has all its changes
rebasing 4:145842775fec "C1" (tip) rebasing 4:145842775fec tip "C1"
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'
| |
| o 2 c master | o 2 c master
| | | |
o | 1 b o | 1 b
|/ |/
o 0 a o 0 a
$ hg rebase -d master -r foo $ hg rebase -d master -r foo
rebasing 3:6c0f977a22d8 "C" (foo tip) rebasing 3:6c0f977a22d8 tip foo "C"
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 abort $ hg abort
rebase aborted rebase aborted
$ hg log -G --template "{rev} {desc} {bookmarks}" $ hg log -G --template "{rev} {desc} {bookmarks}"
@ 3 C foo @ 3 C foo
(leaving bookmark @) (leaving bookmark @)
$ hg book foo $ hg book foo
$ echo y > b $ echo y > b
$ hg add b $ hg add b
$ hg commit -m b2 $ hg commit -m b2
created new head created new head
$ hg rebase -d @ -b foo --tool=internal:fail $ hg rebase -d @ -b foo --tool=internal:fail
rebasing 2:070cf4580bb5 "b2" (foo tip) rebasing 2:070cf4580bb5 tip foo "b2"
unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1] [1]
$ mv .hg/rebasestate ./ # so we're allowed to hg up like in mercurial <2.6.3 $ mv .hg/rebasestate ./ # so we're allowed to hg up like in mercurial <2.6.3
$ hg up -C 0 # user does other stuff in the repo $ hg up -C 0 # user does other stuff in the repo
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mv rebasestate .hg/ # user upgrades to 2.7 $ mv rebasestate .hg/ # user upgrades to 2.7

tests/test-rebase-base-flag.t

> D E > D E
> |/ > |/
> Z B C # C: branching point, E should be picked > Z B C # C: branching point, E should be picked
> \|/ # B should not be picked > \|/ # B should not be picked
> A > A
> | > |
> R > R
> EOS > EOS
rebasing 3:d6003a550c2c "C" (C) rebasing 3:d6003a550c2c C "C"
rebasing 5:4526cf523425 "D" (D) rebasing 5:4526cf523425 D "D"
rebasing 6:b296604d9846 "E" (E tip) rebasing 6:b296604d9846 E tip "E"
o 6: 4870f5e7df37 E o 6: 4870f5e7df37 E
| |
| o 5: dc999528138a D | o 5: dc999528138a D
|/ |/
o 4: 6b3e11729672 C o 4: 6b3e11729672 C
| |
o 3: 57e70bad1ea3 Z o 3: 57e70bad1ea3 Z
| |
> B C D # B, C: multiple branching points > B C D # B, C: multiple branching points
> | |/ # D should not be picked > | |/ # D should not be picked
> Z | / > Z | /
> \|/ > \|/
> A > A
> | > |
> R > R
> EOS > EOS
rebasing 2:c1e6b162678d "B" (B) rebasing 2:c1e6b162678d B "B"
rebasing 3:d6003a550c2c "C" (C) rebasing 3:d6003a550c2c C "C"
rebasing 6:54c8f00cb91c "E" (E tip) rebasing 6:54c8f00cb91c E tip "E"
o 6: 00598421b616 E o 6: 00598421b616 E
|\ |\
| o 5: 6b3e11729672 C | o 5: 6b3e11729672 C
| | | |
o | 4: 85260910e847 B o | 4: 85260910e847 B
|/ |/
o 3: 57e70bad1ea3 Z o 3: 57e70bad1ea3 Z
| |
> E > E
> /| > /|
> Z B C # descendants(B) = B+E. With E, C will be included incorrectly > Z B C # descendants(B) = B+E. With E, C will be included incorrectly
> \|/ > \|/
> A > A
> | > |
> R > R
> EOS > EOS
rebasing 2:c1e6b162678d "B" (B) rebasing 2:c1e6b162678d B "B"
rebasing 5:54c8f00cb91c "E" (E tip) rebasing 5:54c8f00cb91c E tip "E"
o 5: e583bf3ff54c E o 5: e583bf3ff54c E
|\ |\
| o 4: 85260910e847 B | o 4: 85260910e847 B
| | | |
| o 3: 57e70bad1ea3 Z | o 3: 57e70bad1ea3 Z
| | | |
o | 2: d6003a550c2c C o | 2: d6003a550c2c C
|/ |/
o 1: 21a6c4502885 A o 1: 21a6c4502885 A
| |
o 0: b41ce7760717 R o 0: b41ce7760717 R
Rebase should not simplify the "--base" revset using "roots": Rebase should not simplify the "--base" revset using "roots":
$ rebasewithdag -b B+E -d Z <<'EOS' $ rebasewithdag -b B+E -d Z <<'EOS'
> E > E
> /| > /|
> Z B C # roots(B+E) = B. Without E, C will be missed incorrectly > Z B C # roots(B+E) = B. Without E, C will be missed incorrectly
> \|/ > \|/
> A > A
> | > |
> R > R
> EOS > EOS
rebasing 2:c1e6b162678d "B" (B) rebasing 2:c1e6b162678d B "B"
rebasing 3:d6003a550c2c "C" (C) rebasing 3:d6003a550c2c C "C"
rebasing 5:54c8f00cb91c "E" (E tip) rebasing 5:54c8f00cb91c E tip "E"
o 5: 00598421b616 E o 5: 00598421b616 E
|\ |\
| o 4: 6b3e11729672 C | o 4: 6b3e11729672 C
| | | |
o | 3: 85260910e847 B o | 3: 85260910e847 B
|/ |/
o 2: 57e70bad1ea3 Z o 2: 57e70bad1ea3 Z
| |
> C B1 > C B1
> |/ > |/
> B > B
> | > |
> A > A
> | > |
> R > R
> EOS > EOS
rebasing 3:a113dbaa660a "B1" (B1) rebasing 3:a113dbaa660a B1 "B1"
rebasing 5:06ce7b1cc8c2 "B2" (B2) rebasing 5:06ce7b1cc8c2 B2 "B2"
rebasing 6:0ac98cce32d3 "C1" (C1) rebasing 6:0ac98cce32d3 C1 "C1"
rebasing 8:781512f5e33d "C2" (C2) rebasing 8:781512f5e33d C2 "C2"
rebasing 9:428d8c18f641 "E1" (E1) rebasing 9:428d8c18f641 E1 "E1"
rebasing 11:e1bf82f6b6df "E2" (E2) rebasing 11:e1bf82f6b6df E2 "E2"
o 12: e4a37b6fdbd2 E2 o 12: e4a37b6fdbd2 E2
| |
o 11: 9675bea983df E1 o 11: 9675bea983df E1
| |
| o 10: 4faf5d4c80dc C2 | o 10: 4faf5d4c80dc C2
| | | |
| o 9: d4799b1ad57d C1 | o 9: d4799b1ad57d C1
|/ |/
> G H P > G H P
> |\ /| |\ > |\ /| |\
> F E D M N > F E D M N
> \|/| /| |\ > \|/| /| |\
> Z C B I J K L > Z C B I J K L
> \|/ |/ |/ > \|/ |/ |/
> A A A > A A A
> EOS > EOS
rebasing 2:dc0947a82db8 "C" (C) rebasing 2:dc0947a82db8 C "C"
rebasing 8:4e4f9194f9f1 "D" (D) rebasing 8:4e4f9194f9f1 D "D"
rebasing 9:03ca77807e91 "E" (E) rebasing 9:03ca77807e91 E "E"
rebasing 10:afc707c82df0 "F" (F) rebasing 10:afc707c82df0 F "F"
rebasing 13:690dfff91e9e "G" (G) rebasing 13:690dfff91e9e G "G"
rebasing 14:2893b886bb10 "H" (H) rebasing 14:2893b886bb10 H "H"
rebasing 3:08ebfeb61bac "I" (I) rebasing 3:08ebfeb61bac I "I"
rebasing 4:a0a5005cec67 "J" (J) rebasing 4:a0a5005cec67 J "J"
rebasing 5:83780307a7e8 "K" (K) rebasing 5:83780307a7e8 K "K"
rebasing 6:e131637a1cb6 "L" (L) rebasing 6:e131637a1cb6 L "L"
rebasing 11:d1f6d0c3c7e4 "M" (M) rebasing 11:d1f6d0c3c7e4 M "M"
rebasing 12:7aaec6f81888 "N" (N) rebasing 12:7aaec6f81888 N "N"
rebasing 15:325bc8f1760d "P" (P tip) rebasing 15:325bc8f1760d P tip "P"
o 15: 6ef6a0ea3b18 P o 15: 6ef6a0ea3b18 P
|\ |\
| o 14: 20ba3610a7e5 N | o 14: 20ba3610a7e5 N
| |\ | |\
o \ \ 13: cd4f6c06d2ab M o \ \ 13: cd4f6c06d2ab M
|\ \ \ |\ \ \
| | | o 12: bca872041455 L | | | o 12: bca872041455 L
| | | | | | | |
> M3 C0 A1 A2 B1 B2 > M3 C0 A1 A2 B1 B2
> | / | | | | > | / | | | |
> M2 M1 C1 C1 M3 > M2 M1 C1 C1 M3
> | > |
> M1 > M1
> | > |
> M0 > M0
> EOF > EOF
rebasing 4:8817fae53c94 "C0" (C0) rebasing 4:8817fae53c94 C0 "C0"
rebasing 6:06ca5dfe3b5b "B2" (B2) rebasing 6:06ca5dfe3b5b B2 "B2"
rebasing 7:73508237b032 "C1" (C1) rebasing 7:73508237b032 C1 "C1"
rebasing 9:fdb955e2faed "A2" (A2) rebasing 9:fdb955e2faed A2 "A2"
rebasing 11:4e449bd1a643 "A3" (A3) rebasing 11:4e449bd1a643 A3 "A3"
rebasing 10:0a33b0519128 "B1" (B1) rebasing 10:0a33b0519128 B1 "B1"
rebasing 12:209327807c3a "B3" (B3 tip) rebasing 12:209327807c3a B3 tip "B3"
o 12: ceb984566332 B3 o 12: ceb984566332 B3
|\ |\
| o 11: 19d93caac497 B1 | o 11: 19d93caac497 B1
| | | |
| | o 10: 058e73d3916b A3 | | o 10: 058e73d3916b A3
| | |\ | | |\
| +---o 9: 0ba13ad72234 A2 | +---o 9: 0ba13ad72234 A2
| | | | | |
Multiple roots. Roots are ancestors of dest: Multiple roots. Roots are ancestors of dest:
$ rebasewithdag -b B+D -d Z <<'EOF' $ rebasewithdag -b B+D -d Z <<'EOF'
> D Z B > D Z B
> \|\| > \|\|
> C A > C A
> EOF > EOF
rebasing 2:112478962961 "B" (B) rebasing 2:112478962961 B "B"
rebasing 3:b70f76719894 "D" (D) rebasing 3:b70f76719894 D "D"
o 4: 511efad7bf13 D o 4: 511efad7bf13 D
| |
| o 3: 25c4e279af62 B | o 3: 25c4e279af62 B
|/ |/
o 2: 3a49f54d7bb1 Z o 2: 3a49f54d7bb1 Z
|\ |\
| o 1: 96cc3511f894 C | o 1: 96cc3511f894 C
| |
$ rebasewithdag -b E -d Z <<'EOF' $ rebasewithdag -b E -d Z <<'EOF'
> E > E
> |\ > |\
> Z B D > Z B D
> \|\| > \|\|
> A C > A C
> EOF > EOF
rebasing 2:f675d5a1c6a4 "B" (B) rebasing 2:f675d5a1c6a4 B "B"
rebasing 5:f68696fe6af8 "E" (E tip) rebasing 5:f68696fe6af8 E tip "E"
o 5: f6e6f5081554 E o 5: f6e6f5081554 E
|\ |\
| o 4: 30cabcba27be B | o 4: 30cabcba27be B
| |\ | |\
| | o 3: 262e37e34f63 Z | | o 3: 262e37e34f63 Z
| | | | | |
o | | 2: b70f76719894 D o | | 2: b70f76719894 D
|/ / |/ /
o / 1: 96cc3511f894 C o / 1: 96cc3511f894 C
/ /
o 0: 426bada5c675 A o 0: 426bada5c675 A
Multiple roots. Two children share two parents while dest has only one parent: Multiple roots. Two children share two parents while dest has only one parent:
$ rebasewithdag -b B+D -d Z <<'EOF' $ rebasewithdag -b B+D -d Z <<'EOF'
> Z B D > Z B D
> \|\|\ > \|\|\
> A C A > A C A
> EOF > EOF
rebasing 2:f675d5a1c6a4 "B" (B) rebasing 2:f675d5a1c6a4 B "B"
rebasing 3:c2a779e13b56 "D" (D) rebasing 3:c2a779e13b56 D "D"
o 4: 5eecd056b5f8 D o 4: 5eecd056b5f8 D
|\ |\
+---o 3: 30cabcba27be B +---o 3: 30cabcba27be B
| |/ | |/
| o 2: 262e37e34f63 Z | o 2: 262e37e34f63 Z
| | | |
o | 1: 96cc3511f894 C o | 1: 96cc3511f894 C
/ /
o 0: 426bada5c675 A o 0: 426bada5c675 A

tests/test-rebase-bookmarks.t

| |
| @ 2: 49cb3485fa0c 'C' bookmarks: Y Z | @ 2: 49cb3485fa0c 'C' bookmarks: Y Z
| | | |
| o 1: 6c81ed0049f8 'B' bookmarks: X | o 1: 6c81ed0049f8 'B' bookmarks: X
|/ |/
o 0: 1994f17a630e 'A' bookmarks: Y@diverge o 0: 1994f17a630e 'A' bookmarks: Y@diverge
$ hg rebase -s Y -d 3 $ hg rebase -s Y -d 3
rebasing 2:49cb3485fa0c "C" (Y Z) rebasing 2:49cb3485fa0c Y Z "C"
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/49cb3485fa0c-126f3e97-rebase.hg saved backup bundle to $TESTTMP/a1/.hg/strip-backup/49cb3485fa0c-126f3e97-rebase.hg
$ hg tglog $ hg tglog
@ 3: 17fb3faba63c 'C' bookmarks: Y Z @ 3: 17fb3faba63c 'C' bookmarks: Y Z
| |
o 2: 41acb9dca9eb 'D' bookmarks: W X@diverge o 2: 41acb9dca9eb 'D' bookmarks: W X@diverge
| |
| o 1: 6c81ed0049f8 'B' bookmarks: X | o 1: 6c81ed0049f8 'B' bookmarks: X
|/ |/
o 0: 1994f17a630e 'A' bookmarks: Y@diverge o 0: 1994f17a630e 'A' bookmarks: Y@diverge
Do not try to keep active but deleted divergent bookmark Do not try to keep active but deleted divergent bookmark
$ cd .. $ cd ..
$ hg clone -q a a4 $ hg clone -q a a4
$ cd a4 $ cd a4
$ hg up -q 2 $ hg up -q 2
$ hg book W@diverge $ hg book W@diverge
$ hg rebase -s W -d . $ hg rebase -s W -d .
rebasing 3:41acb9dca9eb "D" (W tip) rebasing 3:41acb9dca9eb tip W "D"
saved backup bundle to $TESTTMP/a4/.hg/strip-backup/41acb9dca9eb-b35a6a63-rebase.hg saved backup bundle to $TESTTMP/a4/.hg/strip-backup/41acb9dca9eb-b35a6a63-rebase.hg
$ hg bookmarks $ hg bookmarks
W 3:0d3554f74897 W 3:0d3554f74897
X 1:6c81ed0049f8 X 1:6c81ed0049f8
Y 2:49cb3485fa0c Y 2:49cb3485fa0c
Z 2:49cb3485fa0c Z 2:49cb3485fa0c
Keep bookmarks to the correct rebased changeset Keep bookmarks to the correct rebased changeset
$ cd .. $ cd ..
$ hg clone -q a a2 $ hg clone -q a a2
$ cd a2 $ cd a2
$ hg up -q Z $ hg up -q Z
$ hg rebase -s 1 -d 3 $ hg rebase -s 1 -d 3
rebasing 1:6c81ed0049f8 "B" (X) rebasing 1:6c81ed0049f8 X "B"
rebasing 2:49cb3485fa0c "C" (Y Z) rebasing 2:49cb3485fa0c Y Z "C"
saved backup bundle to $TESTTMP/a2/.hg/strip-backup/6c81ed0049f8-a687065f-rebase.hg saved backup bundle to $TESTTMP/a2/.hg/strip-backup/6c81ed0049f8-a687065f-rebase.hg
$ hg tglog $ hg tglog
@ 3: 3d5fa227f4b5 'C' bookmarks: Y Z @ 3: 3d5fa227f4b5 'C' bookmarks: Y Z
| |
o 2: e926fccfa8ec 'B' bookmarks: X o 2: e926fccfa8ec 'B' bookmarks: X
| |
o 1: 41acb9dca9eb 'D' bookmarks: W o 1: 41acb9dca9eb 'D' bookmarks: W
| |
o 0: 1994f17a630e 'A' bookmarks: o 0: 1994f17a630e 'A' bookmarks:
Keep active bookmark on the correct changeset Keep active bookmark on the correct changeset
$ cd .. $ cd ..
$ hg clone -q a a3 $ hg clone -q a a3
$ cd a3 $ cd a3
$ hg up -q X $ hg up -q X
$ hg rebase -d W $ hg rebase -d W
rebasing 1:6c81ed0049f8 "B" (X) rebasing 1:6c81ed0049f8 X "B"
rebasing 2:49cb3485fa0c "C" (Y Z) rebasing 2:49cb3485fa0c Y Z "C"
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/6c81ed0049f8-a687065f-rebase.hg saved backup bundle to $TESTTMP/a3/.hg/strip-backup/6c81ed0049f8-a687065f-rebase.hg
$ hg tglog $ hg tglog
o 3: 3d5fa227f4b5 'C' bookmarks: Y Z o 3: 3d5fa227f4b5 'C' bookmarks: Y Z
| |
@ 2: e926fccfa8ec 'B' bookmarks: X @ 2: e926fccfa8ec 'B' bookmarks: X
| |
o 1: 41acb9dca9eb 'D' bookmarks: W o 1: 41acb9dca9eb 'D' bookmarks: W
(leaving bookmark X) (leaving bookmark X)
$ echo 'C' > c $ echo 'C' > c
$ hg add c $ hg add c
$ hg ci -m 'other C' $ hg ci -m 'other C'
created new head created new head
$ hg up 3 $ hg up 3
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg rebase --dest 4 $ hg rebase --dest 4
rebasing 3:3d5fa227f4b5 "C" (Y Z) rebasing 3:3d5fa227f4b5 Y Z "C"
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]
$ echo 'c' > c $ echo 'c' > c
$ hg resolve --mark c $ hg resolve --mark c
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase --continue $ hg rebase --continue
rebasing 3:3d5fa227f4b5 "C" (Y Z) rebasing 3:3d5fa227f4b5 Y Z "C"
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-c6ea2371-rebase.hg saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-c6ea2371-rebase.hg
$ hg tglog $ hg tglog
@ 4: 45c0f0ec1203 'C' bookmarks: Y Z @ 4: 45c0f0ec1203 'C' bookmarks: Y Z
| |
o 3: b0e10b7175fd 'other C' bookmarks: o 3: b0e10b7175fd 'other C' bookmarks:
| |
o 2: e926fccfa8ec 'B' bookmarks: X o 2: e926fccfa8ec 'B' bookmarks: X
| |
$ hg ci -m bisect2 $ hg ci -m bisect2
$ echo e >> bimble $ echo e >> bimble
$ hg ci -m bisect3 $ hg ci -m bisect3
$ hg book bisect $ hg book bisect
$ hg update -q Y $ hg update -q Y
$ hg rebase -r '"bisect"^^::"bisect"^' -r bisect -d Z $ hg rebase -r '"bisect"^^::"bisect"^' -r bisect -d Z
rebasing 5:345c90f326a4 "bisect" rebasing 5:345c90f326a4 "bisect"
rebasing 6:f677a2907404 "bisect2" rebasing 6:f677a2907404 "bisect2"
rebasing 7:325c16001345 "bisect3" (bisect tip) rebasing 7:325c16001345 tip bisect "bisect3"
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/345c90f326a4-b4840586-rebase.hg saved backup bundle to $TESTTMP/a3/.hg/strip-backup/345c90f326a4-b4840586-rebase.hg
Bookmark and working parent get moved even if --keep is set (issue5682) Bookmark and working parent get moved even if --keep is set (issue5682)
$ hg init $TESTTMP/book-keep $ hg init $TESTTMP/book-keep
$ cd $TESTTMP/book-keep $ cd $TESTTMP/book-keep
$ hg debugdrawdag <<'EOS' $ hg debugdrawdag <<'EOS'
> B C > B C
> |/ > |/
> A > A
> EOS > EOS
$ eval `hg tags -T 'hg bookmark -ir {node} {tag};\n' | grep -v tip` $ eval `hg tags -T 'hg bookmark -ir {node} {tag};\n' | grep -v tip`
$ rm .hg/localtags $ rm .hg/localtags
$ hg up -q B $ hg up -q B
$ hg tglog $ hg tglog
o 2: dc0947a82db8 'C' bookmarks: C o 2: dc0947a82db8 'C' bookmarks: C
| |
| @ 1: 112478962961 'B' bookmarks: B | @ 1: 112478962961 'B' bookmarks: B
|/ |/
o 0: 426bada5c675 'A' bookmarks: A o 0: 426bada5c675 'A' bookmarks: A
$ hg rebase -r B -d C --keep $ hg rebase -r B -d C --keep
rebasing 1:112478962961 "B" (B) rebasing 1:112478962961 B "B"
$ hg tglog $ hg tglog
@ 3: 9769fc65c4c5 'B' bookmarks: B @ 3: 9769fc65c4c5 'B' bookmarks: B
| |
o 2: dc0947a82db8 'C' bookmarks: C o 2: dc0947a82db8 'C' bookmarks: C
| |
| o 1: 112478962961 'B' bookmarks: | o 1: 112478962961 'B' bookmarks:
|/ |/
o 0: 426bada5c675 'A' bookmarks: A o 0: 426bada5c675 'A' bookmarks: A

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 8 -d 6 $ hg rebase -s 8 -d 6
rebasing 8:4666b71e8e32 "F" (tip) rebasing 8:4666b71e8e32 tip "F"
saved backup bundle to $TESTTMP/a2/.hg/strip-backup/4666b71e8e32-fc1c4e96-rebase.hg saved backup bundle to $TESTTMP/a2/.hg/strip-backup/4666b71e8e32-fc1c4e96-rebase.hg
$ hg branches $ hg branches
branch2 8:6b4bdc1b5ac0 branch2 8:6b4bdc1b5ac0
branch3 7:653b9feb4616 branch3 7:653b9feb4616
branch1 2:0a03079c47fd (inactive) branch1 2:0a03079c47fd (inactive)
default 0:1994f17a630e (inactive) default 0:1994f17a630e (inactive)
| | | |
| 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: not rebasing 7:653b9feb4616 "branch3", its destination already has all its changes note: not rebasing 7:653b9feb4616 "branch3", its destination already has all its changes
rebasing 8:4666b71e8e32 "F" (tip) rebasing 8:4666b71e8e32 tip "F"
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)
$ hg theads $ hg theads
$ cat > $TESTTMP/checkeditform.sh <<EOF $ cat > $TESTTMP/checkeditform.sh <<EOF
> env | grep HGEDITFORM > env | grep HGEDITFORM
> true > true
> EOF > EOF
$ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --dest 7 --source 5 -e $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --dest 7 --source 5 -e
rebasing 5:361a99976cc9 "F" rebasing 5:361a99976cc9 "F"
HGEDITFORM=rebase.merge HGEDITFORM=rebase.merge
rebasing 8:326cfedc031c "I" (tip) rebasing 8:326cfedc031c tip "I"
HGEDITFORM=rebase.normal HGEDITFORM=rebase.normal
saved backup bundle to $TESTTMP/a3/c4/.hg/strip-backup/361a99976cc9-35e980d0-rebase.hg saved backup bundle to $TESTTMP/a3/c4/.hg/strip-backup/361a99976cc9-35e980d0-rebase.hg

tests/test-rebase-check-restore.t

|/ |/
| o 2:secret 'C' | o 2:secret 'C'
| | | |
| o 1:draft 'B' | o 1:draft 'B'
|/ |/
o 0:draft 'A' o 0:draft 'A'
$ hg rebase -s 5 -d 4 --keepbranches $ hg rebase -s 5 -d 4 --keepbranches
rebasing 5:01e6ebbd8272 "F" (tip) rebasing 5:01e6ebbd8272 tip "F"
merging A merging A
warning: conflicts while merging A! (edit, then use 'hg resolve --mark') warning: conflicts while merging A! (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]
Solve the conflict and go on: Solve the conflict and go on:
$ echo 'conflict solved' > A $ echo 'conflict solved' > A
$ rm A.orig $ rm A.orig
$ hg resolve -m A $ hg resolve -m A
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase --continue $ hg rebase --continue
rebasing 5:01e6ebbd8272 "F" (tip) rebasing 5:01e6ebbd8272 tip "F"
saved backup bundle to $TESTTMP/a2/.hg/strip-backup/01e6ebbd8272-6fd3a015-rebase.hg saved backup bundle to $TESTTMP/a2/.hg/strip-backup/01e6ebbd8272-6fd3a015-rebase.hg
$ hg tglog $ hg tglog
@ 5:draft 'F' notdefault @ 5:draft 'F' notdefault
| |
o 4:draft 'E' o 4:draft 'E'
| |
o 3:draft 'D' o 3:draft 'D'

tests/test-rebase-collapse.t

$ cat > $TESTTMP/editor.sh <<EOF $ cat > $TESTTMP/editor.sh <<EOF
> echo "==== before editing" > echo "==== before editing"
> cat \$1 > cat \$1
> echo "====" > echo "===="
> echo "edited manually" >> \$1 > echo "edited manually" >> \$1
> EOF > EOF
$ HGEDITOR="sh $TESTTMP/editor.sh" hg rebase --collapse --keepbranches -e --source B --dest F $ HGEDITOR="sh $TESTTMP/editor.sh" hg rebase --collapse --keepbranches -e --source B --dest F
rebasing 1:112478962961 "B" (B) rebasing 1:112478962961 B "B"
rebasing 3:26805aba1e60 "C" (C) rebasing 3:26805aba1e60 C "C"
rebasing 5:f585351a92f8 "D" (D tip) rebasing 5:f585351a92f8 D tip "D"
==== before editing ==== before editing
Collapsed revision Collapsed revision
* B * B
* C * C
* D * D
HG: Enter commit message. Lines beginning with 'HG:' are removed. HG: Enter commit message. Lines beginning with 'HG:' are removed.
> |/| > |/|
> C B > C B
> |/ > |/
> A > A
> EOF > EOF
$ hg phase --force --secret D $ hg phase --force --secret D
$ hg rebase --source B --collapse --dest F $ hg rebase --source B --collapse --dest F
rebasing 1:112478962961 "B" (B) rebasing 1:112478962961 B "B"
rebasing 3:4e4f9194f9f1 "D" (D) rebasing 3:4e4f9194f9f1 D "D"
saved backup bundle to $TESTTMP/linearized-merge/.hg/strip-backup/112478962961-e389075b-rebase.hg saved backup bundle to $TESTTMP/linearized-merge/.hg/strip-backup/112478962961-e389075b-rebase.hg
$ hg tglog $ hg tglog
o 3: 5bdc08b7da2b 'Collapsed revision o 3: 5bdc08b7da2b 'Collapsed revision
| * B | * B
| * D' | * D'
o 2: afc707c82df0 'F' o 2: afc707c82df0 'F'
| |
abort: message can only be specified with collapse abort: message can only be specified with collapse
[255] [255]
$ cat > $TESTTMP/checkeditform.sh <<EOF $ cat > $TESTTMP/checkeditform.sh <<EOF
> env | grep HGEDITFORM > env | grep HGEDITFORM
> true > true
> EOF > EOF
$ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --source B --collapse -m 'custom message' -e --dest D $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --source B --collapse -m 'custom message' -e --dest D
rebasing 1:112478962961 "B" (B) rebasing 1:112478962961 B "B"
rebasing 3:26805aba1e60 "C" (C tip) rebasing 3:26805aba1e60 C tip "C"
HGEDITFORM=rebase.collapse HGEDITFORM=rebase.collapse
saved backup bundle to $TESTTMP/message/.hg/strip-backup/112478962961-f4131707-rebase.hg saved backup bundle to $TESTTMP/message/.hg/strip-backup/112478962961-f4131707-rebase.hg
$ hg tglog $ hg tglog
o 2: 2f197b9a08f3 'custom message' o 2: 2f197b9a08f3 'custom message'
| |
o 1: b18e25de2cf5 'D' o 1: b18e25de2cf5 'D'
| |
$ hg rebase -s C --dest H --collapse $ hg rebase -s C --dest H --collapse
abort: unable to collapse on top of 3, there is more than one external parent: 1, 6 abort: unable to collapse on top of 3, there is more than one external parent: 1, 6
[255] [255]
Rebase and collapse - E onto H: Rebase and collapse - E onto H:
$ hg rebase -s E --dest H --collapse # root (E) is not a merge $ hg rebase -s E --dest H --collapse # root (E) is not a merge
rebasing 5:49cb92066bfd "E" (E) rebasing 5:49cb92066bfd E "E"
rebasing 6:11abe3fb10b8 "F" (F) rebasing 6:11abe3fb10b8 F "F"
rebasing 7:64e264db77f0 "G" (G tip) rebasing 7:64e264db77f0 G tip "G"
saved backup bundle to $TESTTMP/multiple-external-parents/.hg/strip-backup/49cb92066bfd-ee8a8a79-rebase.hg saved backup bundle to $TESTTMP/multiple-external-parents/.hg/strip-backup/49cb92066bfd-ee8a8a79-rebase.hg
$ hg tglog $ hg tglog
o 5: 8b2315790719 'Collapsed revision o 5: 8b2315790719 'Collapsed revision
|\ * E |\ * E
| | * F | | * F
| | * G' | | * G'
| o 4: 4e4f9194f9f1 'D' | o 4: 4e4f9194f9f1 'D'
> D E # D/D = D\n > D E # D/D = D\n
> |\| > |\|
> I C B > I C B
> \|/ > \|/
> A > A
> EOF > EOF
$ hg rebase -s F --dest I --collapse # root (F) is not a merge $ hg rebase -s F --dest I --collapse # root (F) is not a merge
rebasing 6:c82b08f646f1 "F" (F) rebasing 6:c82b08f646f1 F "F"
file 'E' was deleted in local [dest] but was modified in other [source]. file 'E' was deleted in local [dest] but was modified in other [source].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u What do you want to do? u
unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1] [1]
$ echo F > E $ echo F > E
$ hg resolve -m $ hg resolve -m
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase -c $ hg rebase -c
rebasing 6:c82b08f646f1 "F" (F) rebasing 6:c82b08f646f1 F "F"
rebasing 7:a6db7fa104e1 "G" (G) rebasing 7:a6db7fa104e1 G "G"
rebasing 8:e1d201b72d91 "H" (H tip) rebasing 8:e1d201b72d91 H tip "H"
saved backup bundle to $TESTTMP/external-parent/.hg/strip-backup/c82b08f646f1-f2721fbf-rebase.hg saved backup bundle to $TESTTMP/external-parent/.hg/strip-backup/c82b08f646f1-f2721fbf-rebase.hg
$ hg tglog $ hg tglog
o 6: 681daa3e686d 'Collapsed revision o 6: 681daa3e686d 'Collapsed revision
|\ * F |\ * F
| | * G | | * G
| | * H' | | * H'
| | o 5: 49cb92066bfd 'E' | | o 5: 49cb92066bfd 'E'
$ cd multiple-bases $ cd multiple-bases
$ hg debugdrawdag << 'EOF' $ hg debugdrawdag << 'EOF'
> C B > C B
> D |/ > D |/
> |/ > |/
> A > A
> EOF > EOF
$ hg rebase --collapse -r 'B+C' -d D $ hg rebase --collapse -r 'B+C' -d D
rebasing 1:fc2b737bb2e5 "B" (B) rebasing 1:fc2b737bb2e5 B "B"
rebasing 2:dc0947a82db8 "C" (C) rebasing 2:dc0947a82db8 C "C"
saved backup bundle to $TESTTMP/multiple-bases/.hg/strip-backup/dc0947a82db8-b0c1a7ea-rebase.hg saved backup bundle to $TESTTMP/multiple-bases/.hg/strip-backup/dc0947a82db8-b0c1a7ea-rebase.hg
$ hg tglog $ hg tglog
o 2: 2127ae44d291 'Collapsed revision o 2: 2127ae44d291 'Collapsed revision
| * B | * B
| * C' | * C'
o 1: b18e25de2cf5 'D' o 1: b18e25de2cf5 'D'
| |
o 0: 426bada5c675 'A' o 0: 426bada5c675 'A'
> |/ > |/
> F B > F B
> |/ > |/
> A > A
> EOF > EOF
$ hg rebase -s B --collapse --dest F $ hg rebase -s B --collapse --dest F
rebasing 1:112478962961 "B" (B) rebasing 1:112478962961 B "B"
rebasing 3:26805aba1e60 "C" (C) rebasing 3:26805aba1e60 C "C"
rebasing 4:be0ef73c17ad "D" (D) rebasing 4:be0ef73c17ad D "D"
rebasing 5:02c4367d6973 "E" (E tip) rebasing 5:02c4367d6973 E tip "E"
saved backup bundle to $TESTTMP/internal-merge/.hg/strip-backup/112478962961-1dfb057b-rebase.hg saved backup bundle to $TESTTMP/internal-merge/.hg/strip-backup/112478962961-1dfb057b-rebase.hg
$ hg tglog $ hg tglog
o 2: c0512a1797b0 'Collapsed revision o 2: c0512a1797b0 'Collapsed revision
| * B | * B
| * C | * C
| * D | * D
| * E' | * E'
|/ |/
o 0: f447d5abf5ea 'add' o 0: f447d5abf5ea 'add'
$ hg rebase --collapse -d 1 $ hg rebase --collapse -d 1
rebasing 2:6e7340ee38c0 "move1" rebasing 2:6e7340ee38c0 "move1"
merging a and d to d merging a and d to d
merging b and e to e merging b and e to e
merging c and f to f merging c and f to f
rebasing 3:338e84e2e558 "move2" (tip) rebasing 3:338e84e2e558 tip "move2"
merging f and c to c merging f and c to c
merging e and g to g merging e and g to g
saved backup bundle to $TESTTMP/copies/.hg/strip-backup/6e7340ee38c0-ef8ef003-rebase.hg saved backup bundle to $TESTTMP/copies/.hg/strip-backup/6e7340ee38c0-ef8ef003-rebase.hg
$ hg st $ hg st
$ hg st --copies --change tip $ hg st --copies --change tip
A d A d
a a
A g A g
abort: cannot rebase changeset with children abort: cannot rebase changeset with children
(use --keep to keep original changesets) (use --keep to keep original changesets)
[255] [255]
Test collapsing in place Test collapsing in place
$ hg rebase --collapse -b . -d 0 $ hg rebase --collapse -b . -d 0
rebasing 1:1352765a01d4 "change" rebasing 1:1352765a01d4 "change"
rebasing 2:64b456429f67 "Collapsed revision" (tip) rebasing 2:64b456429f67 tip "Collapsed revision"
saved backup bundle to $TESTTMP/copies/.hg/strip-backup/1352765a01d4-45a352ea-rebase.hg saved backup bundle to $TESTTMP/copies/.hg/strip-backup/1352765a01d4-45a352ea-rebase.hg
$ hg st --change tip --copies $ hg st --change tip --copies
M a M a
M c M c
A d A d
a a
A g A g
b b
adding a adding a
$ hg rm a $ hg rm a
$ touch b $ touch b
$ hg commit -Am b $ hg commit -Am b
adding b adding b
$ hg book foo $ hg book foo
$ hg rebase -d 0 -r "1::2" --collapse -m collapsed $ hg rebase -d 0 -r "1::2" --collapse -m collapsed
rebasing 1:6d8d9f24eec3 "a" rebasing 1:6d8d9f24eec3 "a"
rebasing 2:1cc73eca5ecc "b" (foo tip) rebasing 2:1cc73eca5ecc tip foo "b"
saved backup bundle to $TESTTMP/collapseaddremove/.hg/strip-backup/6d8d9f24eec3-77d3b6e2-rebase.hg saved backup bundle to $TESTTMP/collapseaddremove/.hg/strip-backup/6d8d9f24eec3-77d3b6e2-rebase.hg
$ hg log -G --template "{rev}: '{desc}' {bookmarks}" $ hg log -G --template "{rev}: '{desc}' {bookmarks}"
@ 1: 'collapsed' foo @ 1: 'collapsed' foo
| |
o 0: 'base' o 0: 'base'
$ hg manifest --rev tip $ hg manifest --rev tip
b b
base base
$ cd .. $ cd ..
Test that rebase --collapse will remember message after Test that rebase --collapse will remember message after
running into merge conflict and invoking rebase --continue. running into merge conflict and invoking rebase --continue.
$ hg init collapse_remember_message $ hg init collapse_remember_message
$ cd collapse_remember_message $ cd collapse_remember_message
$ hg debugdrawdag << 'EOF' $ hg debugdrawdag << 'EOF'
> C B # B/A = B\n > C B # B/A = B\n
> |/ # C/A = C\n > |/ # C/A = C\n
> A > A
> EOF > EOF
$ hg rebase --collapse -m "new message" -b B -d C $ hg rebase --collapse -m "new message" -b B -d C
rebasing 1:81e5401e4d37 "B" (B) rebasing 1:81e5401e4d37 B "B"
merging A merging A
warning: conflicts while merging A! (edit, then use 'hg resolve --mark') warning: conflicts while merging A! (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]
$ rm A.orig $ rm A.orig
$ 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:81e5401e4d37 "B" (B) rebasing 1:81e5401e4d37 B "B"
saved backup bundle to $TESTTMP/collapse_remember_message/.hg/strip-backup/81e5401e4d37-96c3dd30-rebase.hg saved backup bundle to $TESTTMP/collapse_remember_message/.hg/strip-backup/81e5401e4d37-96c3dd30-rebase.hg
$ hg log $ hg log
changeset: 2:17186933e123 changeset: 2:17186933e123
tag: tip tag: tip
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: new message summary: new message
$ hg debugdrawdag << 'EOF' $ hg debugdrawdag << 'EOF'
> C # D/A = D\n > C # D/A = D\n
> | # C/A = C\n > | # C/A = C\n
> B D # B/A = B\n > B D # B/A = B\n
> |/ # A/A = A\n > |/ # A/A = A\n
> A > A
> EOF > EOF
$ hg rebase --collapse -t internal:merge3 -s B -d D $ hg rebase --collapse -t internal:merge3 -s B -d D
rebasing 1:f899f3910ce7 "B" (B) rebasing 1:f899f3910ce7 B "B"
merging A merging A
warning: conflicts while merging A! (edit, then use 'hg resolve --mark') warning: conflicts while merging A! (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
o 3: 63668d570d21 'C' o 3: 63668d570d21 'C'
| |
| @ 2: 82b8abf9c185 'D' | @ 2: 82b8abf9c185 'D'
======= =======
B B
>>>>>>> source: f899f3910ce7 B - test: B >>>>>>> source: f899f3910ce7 B - test: B
$ echo BC > A $ echo BC > A
$ hg resolve -m $ hg resolve -m
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase --continue $ hg rebase --continue
rebasing 1:f899f3910ce7 "B" (B) rebasing 1:f899f3910ce7 B "B"
rebasing 3:63668d570d21 "C" (C tip) rebasing 3:63668d570d21 C tip "C"
merging A merging A
warning: conflicts while merging A! (edit, then use 'hg resolve --mark') warning: conflicts while merging A! (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
% 3: 63668d570d21 'C' % 3: 63668d570d21 'C'
| |
| @ 2: 82b8abf9c185 'D' | @ 2: 82b8abf9c185 'D'
======= =======
C C
>>>>>>> source: 63668d570d21 C tip - test: C >>>>>>> source: 63668d570d21 C tip - test: C
$ echo BD > A $ echo BD > A
$ hg resolve -m $ hg resolve -m
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ HGEDITOR=false hg rebase --continue --config ui.interactive=1 $ HGEDITOR=false hg rebase --continue --config ui.interactive=1
already rebased 1:f899f3910ce7 "B" (B) as 82b8abf9c185 already rebased 1:f899f3910ce7 B "B" as 82b8abf9c185
rebasing 3:63668d570d21 "C" (C tip) rebasing 3:63668d570d21 C tip "C"
abort: edit failed: false exited with status 1 abort: edit failed: false exited with status 1
[255] [255]
$ hg tglog $ hg tglog
o 3: 63668d570d21 'C' o 3: 63668d570d21 'C'
| |
| @ 2: 82b8abf9c185 'D' | @ 2: 82b8abf9c185 'D'
| | | |
o | 1: f899f3910ce7 'B' o | 1: f899f3910ce7 'B'
|/ |/
o 0: 4a2df7238c3b 'A' o 0: 4a2df7238c3b 'A'
$ hg rebase --continue $ hg rebase --continue
already rebased 1:f899f3910ce7 "B" (B) as 82b8abf9c185 already rebased 1:f899f3910ce7 B "B" as 82b8abf9c185
already rebased 3:63668d570d21 "C" (C tip) as 82b8abf9c185 already rebased 3:63668d570d21 C tip "C" as 82b8abf9c185
saved backup bundle to $TESTTMP/aborted-editor/.hg/strip-backup/f899f3910ce7-7cab5e15-rebase.hg saved backup bundle to $TESTTMP/aborted-editor/.hg/strip-backup/f899f3910ce7-7cab5e15-rebase.hg

tests/test-rebase-conflicts.t

$ echo 'resolved merge' >common $ echo 'resolved merge' >common
$ hg resolve -m common $ hg resolve -m common
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase --continue $ hg rebase --continue
already rebased 3:3163e20567cc "L1" as 3e046f2ecedb already rebased 3:3163e20567cc "L1" as 3e046f2ecedb
rebasing 4:46f0b057b5c0 "L2" rebasing 4:46f0b057b5c0 "L2"
rebasing 5:8029388f38dc "L3" (mybook) rebasing 5:8029388f38dc mybook "L3"
saved backup bundle to $TESTTMP/a/.hg/strip-backup/3163e20567cc-5ca4656e-rebase.hg saved backup bundle to $TESTTMP/a/.hg/strip-backup/3163e20567cc-5ca4656e-rebase.hg
$ hg tglog $ hg tglog
@ 5:secret 'L3' mybook @ 5:secret 'L3' mybook
| |
o 4:secret 'L2' o 4:secret 'L2'
| |
o 3:draft 'L1' o 3:draft 'L1'
getting f1.txt getting f1.txt
committing files: committing files:
f1.txt f1.txt
committing manifest committing manifest
committing changelog committing changelog
updating the branch cache updating the branch cache
rebased as 19c888675e13 rebased as 19c888675e13
rebase status stored rebase status stored
rebasing 10:2f2496ddf49d "merge" (tip) rebasing 10:2f2496ddf49d tip "merge"
future parents are 11 and 7 future parents are 11 and 7
already in destination already in destination
merge against 10:2f2496ddf49d merge against 10:2f2496ddf49d
detach base 9:e31216eec445 detach base 9:e31216eec445
resolving manifests resolving manifests
branchmerge: True, force: True, partial: False branchmerge: True, force: True, partial: False
ancestor: e31216eec445, local: 19c888675e13+, remote: 2f2496ddf49d ancestor: e31216eec445, local: 19c888675e13+, remote: 2f2496ddf49d
f1.txt: remote is newer -> g f1.txt: remote is newer -> g
$ echo b >> a $ echo b >> a
$ hg commit -q -m 'ab' $ hg commit -q -m 'ab'
$ hg bookmark ab $ hg bookmark ab
$ hg up -q '.^' $ hg up -q '.^'
$ echo b >> a $ echo b >> a
$ echo c >> a $ echo c >> a
$ hg commit -q -m 'abc' $ hg commit -q -m 'abc'
$ hg rebase -s 7bc217434fc1 -d ab --keep $ hg rebase -s 7bc217434fc1 -d ab --keep
rebasing 13:7bc217434fc1 "abc" (tip) rebasing 13:7bc217434fc1 tip "abc"
merging a merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a! (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 diff $ hg diff
diff -r 328e4ab1f7cc a diff -r 328e4ab1f7cc 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,2 +1,6 @@ @@ -1,2 +1,6 @@
a a
b b
+<<<<<<< dest: 328e4ab1f7cc ab - test: ab +<<<<<<< dest: 328e4ab1f7cc ab - test: ab
+======= +=======
+c +c
+>>>>>>> source: 7bc217434fc1 - test: abc +>>>>>>> source: 7bc217434fc1 - test: abc
$ hg rebase --abort $ hg rebase --abort
rebase aborted rebase aborted
$ hg up -q -C 7bc217434fc1 $ hg up -q -C 7bc217434fc1
$ hg rebase -s . -d ab --keep -t internal:merge3 $ hg rebase -s . -d ab --keep -t internal:merge3
rebasing 13:7bc217434fc1 "abc" (tip) rebasing 13:7bc217434fc1 tip "abc"
merging a merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a! (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 diff $ hg diff
diff -r 328e4ab1f7cc a diff -r 328e4ab1f7cc 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)
> |/ > |/
> A > A
> EOS > EOS
$ hg update E -q $ hg update E -q
$ echo 3 > B $ echo 3 > B
$ hg commit --amend -m E -A B -q $ hg commit --amend -m E -A B -q
$ hg rebase -r B+D -d . --config experimental.evolution=true $ hg rebase -r B+D -d . --config experimental.evolution=true
rebasing 1:112478962961 "B" (B) rebasing 1:112478962961 B "B"
merging B merging B
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]
$ echo 4 > B $ echo 4 > B
$ hg resolve -m $ hg resolve -m
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase --continue --config experimental.evolution=none $ hg rebase --continue --config experimental.evolution=none
rebasing 1:112478962961 "B" (B) rebasing 1:112478962961 B "B"
rebasing 3:f585351a92f8 "D" (D) rebasing 3:f585351a92f8 D "D"
warning: orphaned descendants detected, not stripping 112478962961 warning: orphaned descendants detected, not stripping 112478962961
saved backup bundle to $TESTTMP/b/.hg/strip-backup/f585351a92f8-e536a9e4-rebase.hg saved backup bundle to $TESTTMP/b/.hg/strip-backup/f585351a92f8-e536a9e4-rebase.hg
$ rm .hg/localtags $ rm .hg/localtags
$ hg tglog $ hg tglog
o 5:draft 'D' o 5:draft 'D'
| |
o 4:draft 'B' o 4:draft 'B'
> C B # B/conflict = bar\n > C B # B/conflict = bar\n
> |/ > |/
> A > A
> EOS > EOS
$ hg co F $ hg co F
5 files updated, 0 files merged, 0 files removed, 0 files unresolved 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg rebase -d B $ hg rebase -d B
rebasing 2:dc0947a82db8 "C" (C) rebasing 2:dc0947a82db8 C "C"
rebasing 3:e7b3f00ed42e "D" (D) rebasing 3:e7b3f00ed42e D "D"
rebasing 4:03ca77807e91 "E" (E) rebasing 4:03ca77807e91 E "E"
rebasing 5:9a6b91dc2044 "F" (F tip) rebasing 5:9a6b91dc2044 F tip "F"
merging conflict merging conflict
warning: conflicts while merging conflict! (edit, then use 'hg resolve --mark') warning: conflicts while merging conflict! (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
@ 8:draft 'E' @ 8:draft 'E'
| |
| @ 7:draft 'D' | @ 7:draft 'D'
|/ |/
o 0:draft 'A' o 0:draft 'A'
$ echo baz > conflict $ echo baz > conflict
$ hg resolve -m $ hg resolve -m
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase -c $ hg rebase -c
already rebased 2:dc0947a82db8 "C" (C) as 0199610c343e already rebased 2:dc0947a82db8 C "C" as 0199610c343e
already rebased 3:e7b3f00ed42e "D" (D) as f0dd538aaa63 already rebased 3:e7b3f00ed42e D "D" as f0dd538aaa63
already rebased 4:03ca77807e91 "E" (E) as cbf25af8347d already rebased 4:03ca77807e91 E "E" as cbf25af8347d
rebasing 5:9a6b91dc2044 "F" (F) rebasing 5:9a6b91dc2044 F "F"
saved backup bundle to $TESTTMP/conflict-in-merge/.hg/strip-backup/dc0947a82db8-ca7e7d5b-rebase.hg saved backup bundle to $TESTTMP/conflict-in-merge/.hg/strip-backup/dc0947a82db8-ca7e7d5b-rebase.hg
$ hg tglog $ hg tglog
@ 5:draft 'F' @ 5:draft 'F'
|\ |\
| o 4:draft 'E' | o 4:draft 'E'
| | | |
o | 3:draft 'D' o | 3:draft 'D'
|/ |/
o 2:draft 'C' o 2:draft 'C'
| |
o 1:draft 'B' o 1:draft 'B'
| |
o 0:draft 'A' o 0:draft 'A'

tests/test-rebase-dest.t

0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo c >> c $ echo c >> c
$ hg commit -qAm cc $ hg commit -qAm cc
$ hg rebase $ hg rebase
abort: you must specify a destination abort: you must specify a destination
(use: hg rebase -d REV) (use: hg rebase -d REV)
[255] [255]
$ hg rebase -d 1 $ hg rebase -d 1
rebasing 2:5db65b93a12b "cc" (tip) rebasing 2:5db65b93a12b tip "cc"
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/5db65b93a12b-4fb789ec-rebase.hg saved backup bundle to $TESTTMP/repo/.hg/strip-backup/5db65b93a12b-4fb789ec-rebase.hg
$ hg rebase -d 0 -r . -q $ hg rebase -d 0 -r . -q
$ HGPLAIN=1 hg rebase $ HGPLAIN=1 hg rebase
rebasing 2:889b0bc6a730 "cc" (tip) rebasing 2:889b0bc6a730 tip "cc"
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/889b0bc6a730-41ec4f81-rebase.hg saved backup bundle to $TESTTMP/repo/.hg/strip-backup/889b0bc6a730-41ec4f81-rebase.hg
$ hg rebase -d 0 -r . -q $ hg rebase -d 0 -r . -q
$ hg --config commands.rebase.requiredest=False rebase $ hg --config commands.rebase.requiredest=False rebase
rebasing 2:279de9495438 "cc" (tip) rebasing 2:279de9495438 tip "cc"
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/279de9495438-ab0a5128-rebase.hg saved backup bundle to $TESTTMP/repo/.hg/strip-backup/279de9495438-ab0a5128-rebase.hg
Requiring dest should not break continue or other rebase options Requiring dest should not break continue or other rebase options
$ hg up 1 -q $ hg up 1 -q
$ echo d >> c $ echo d >> c
$ hg commit -qAm dc $ hg commit -qAm dc
$ hg log -G -T '{rev} {desc}' $ hg log -G -T '{rev} {desc}'
@ 3 dc @ 3 dc
| |
| o 2 cc | o 2 cc
|/ |/
o 1 bb o 1 bb
| |
o 0 aa o 0 aa
$ hg rebase -d 2 $ hg rebase -d 2
rebasing 3:0537f6b50def "dc" (tip) rebasing 3:0537f6b50def tip "dc"
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]
$ echo d > c $ echo d > c
$ hg resolve --mark --all $ hg resolve --mark --all
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase --continue $ hg rebase --continue
rebasing 3:0537f6b50def "dc" (tip) rebasing 3:0537f6b50def tip "dc"
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0537f6b50def-be4c7386-rebase.hg saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0537f6b50def-be4c7386-rebase.hg
$ cd .. $ cd ..
Check rebase.requiredest interaction with pull --rebase Check rebase.requiredest interaction with pull --rebase
$ hg clone repo clone $ hg clone repo clone
updating to branch default updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
Rebase to null should work: Rebase to null should work:
$ rebasewithdag -r A+C+D -d 'null' <<'EOS' $ rebasewithdag -r A+C+D -d 'null' <<'EOS'
> C D > C D
> | | > | |
> A B > A B
> EOS > EOS
already rebased 0:426bada5c675 "A" (A) already rebased 0:426bada5c675 A "A"
already rebased 2:dc0947a82db8 "C" (C) already rebased 2:dc0947a82db8 C "C"
rebasing 3:004dc1679908 "D" (D tip) rebasing 3:004dc1679908 D tip "D"
o 4: d8d8601abd5e D o 4: d8d8601abd5e D
o 2: dc0947a82db8 C o 2: dc0947a82db8 C
| |
| o 1: fc2b737bb2e5 B | o 1: fc2b737bb2e5 B
| |
o 0: 426bada5c675 A o 0: 426bada5c675 A
$ rebasewithdag -s 'all() - roots(all())' -d 'roots(all()) - ::SRC' <<'EOS' $ rebasewithdag -s 'all() - roots(all())' -d 'roots(all()) - ::SRC' <<'EOS'
> C F > C F
> | | > | |
> B E > B E
> | | > | |
> A D > A D
> EOS > EOS
rebasing 2:112478962961 "B" (B) rebasing 2:112478962961 B "B"
rebasing 4:26805aba1e60 "C" (C) rebasing 4:26805aba1e60 C "C"
rebasing 3:cd488e83d208 "E" (E) rebasing 3:cd488e83d208 E "E"
rebasing 5:0069ba24938a "F" (F tip) rebasing 5:0069ba24938a F tip "F"
o 9: d150ff263fc8 F o 9: d150ff263fc8 F
| |
o 8: 66f30a1a2eab E o 8: 66f30a1a2eab E
| |
| o 7: 93db94ffae0e C | o 7: 93db94ffae0e C
| | | |
| o 6: d0071c3b0c88 B | o 6: d0071c3b0c88 B
| | | |
| o 1: 058c1e1fb10a D | o 1: 058c1e1fb10a D
| |
o 0: 426bada5c675 A o 0: 426bada5c675 A
Different destinations for merge changesets with a same root: Different destinations for merge changesets with a same root:
$ rebasewithdag -s B -d '((parents(SRC)-B-A)::) - (::ALLSRC)' <<'EOS' $ rebasewithdag -s B -d '((parents(SRC)-B-A)::) - (::ALLSRC)' <<'EOS'
> C G > C G
> |\| > |\|
> | F > | F
> | > |
> B E > B E
> |\| > |\|
> A D > A D
> EOS > EOS
rebasing 3:a4256619d830 "B" (B) rebasing 3:a4256619d830 B "B"
rebasing 6:8e139e245220 "C" (C tip) rebasing 6:8e139e245220 C tip "C"
o 8: d7d1169e9b1c C o 8: d7d1169e9b1c C
|\ |\
| o 7: 2ed0c8546285 B | o 7: 2ed0c8546285 B
| |\ | |\
o | | 5: 8fdb2c1feb20 G o | | 5: 8fdb2c1feb20 G
| | | | | |
| | o 4: cd488e83d208 E | | o 4: cd488e83d208 E
| | | | | |
> D G > D G
> |/ > |/
> C F > C F
> |/ > |/
> B E # E will be ignored, since E^^ is empty > B E # E will be ignored, since E^^ is empty
> |/ > |/
> A > A
> EOS > EOS
rebasing 4:33441538d4aa "F" (F) rebasing 4:33441538d4aa F "F"
rebasing 6:cf43ad9da869 "G" (G) rebasing 6:cf43ad9da869 G "G"
rebasing 7:eef94f3b5f03 "H" (H tip) rebasing 7:eef94f3b5f03 H tip "H"
o 10: b3d84c6666cf H o 10: b3d84c6666cf H
| |
| o 5: f585351a92f8 D | o 5: f585351a92f8 D
|/ |/
o 3: 26805aba1e60 C o 3: 26805aba1e60 C
| |
| o 9: f7c28a1a15e2 G | o 9: f7c28a1a15e2 G
|/ |/
o 1: 112478962961 B o 1: 112478962961 B
| |
| o 8: 02aa697facf7 F | o 8: 02aa697facf7 F
|/ |/
| o 2: 7fb047a69f22 E | o 2: 7fb047a69f22 E
|/ |/
o 0: 426bada5c675 A o 0: 426bada5c675 A
Source overlaps with destination: Source overlaps with destination:
$ rebasewithdag -s 'B+C+D' -d 'map(SRC, "B:C,C:D")' <<'EOS' $ rebasewithdag -s 'B+C+D' -d 'map(SRC, "B:C,C:D")' <<'EOS'
> B C D > B C D
> \|/ > \|/
> A > A
> EOS > EOS
rebasing 2:dc0947a82db8 "C" (C) rebasing 2:dc0947a82db8 C "C"
rebasing 1:112478962961 "B" (B) rebasing 1:112478962961 B "B"
o 5: 5fe9935d5222 B o 5: 5fe9935d5222 B
| |
o 4: 12d20731b9e0 C o 4: 12d20731b9e0 C
| |
o 3: b18e25de2cf5 D o 3: b18e25de2cf5 D
| |
o 0: 426bada5c675 A o 0: 426bada5c675 A
$ rebasewithdag -r 'all()' -d 'SRC^' <<'EOS' $ rebasewithdag -r 'all()' -d 'SRC^' <<'EOS'
> E F > E F
> /| | > /| |
> B C D > B C D
> \|/ > \|/
> A > A
> EOS > EOS
already rebased 1:112478962961 "B" (B) already rebased 1:112478962961 B "B"
already rebased 2:dc0947a82db8 "C" (C) already rebased 2:dc0947a82db8 C "C"
already rebased 3:b18e25de2cf5 "D" (D) already rebased 3:b18e25de2cf5 D "D"
already rebased 4:312782b8f06e "E" (E) already rebased 4:312782b8f06e E "E"
already rebased 5:ad6717a6a58e "F" (F tip) already rebased 5:ad6717a6a58e F tip "F"
o 5: ad6717a6a58e F o 5: ad6717a6a58e F
| |
o 3: b18e25de2cf5 D o 3: b18e25de2cf5 D
| |
| o 4: 312782b8f06e E | o 4: 312782b8f06e E
| |\ | |\
+---o 2: dc0947a82db8 C +---o 2: dc0947a82db8 C
| | | |
| o 1: 112478962961 B | o 1: 112478962961 B
|/ |/
o 0: 426bada5c675 A o 0: 426bada5c675 A
Massively rewrite the DAG: Massively rewrite the DAG:
$ rebasewithdag -r 'all()' -d 'map(SRC, "A:I,I:null,H:A,B:J,J:C,C:H,D:E,F:G,G:K,K:D,E:B")' <<'EOS' $ rebasewithdag -r 'all()' -d 'map(SRC, "A:I,I:null,H:A,B:J,J:C,C:H,D:E,F:G,G:K,K:D,E:B")' <<'EOS'
> D G K > D G K
> | | | > | | |
> C F J > C F J
> | | | > | | |
> B E I > B E I
> \| | > \| |
> A H > A H
> EOS > EOS
rebasing 4:701514e1408d "I" (I) rebasing 4:701514e1408d I "I"
rebasing 0:426bada5c675 "A" (A) rebasing 0:426bada5c675 A "A"
rebasing 1:e7050b6e5048 "H" (H) rebasing 1:e7050b6e5048 H "H"
rebasing 5:26805aba1e60 "C" (C) rebasing 5:26805aba1e60 C "C"
rebasing 7:cf89f86b485b "J" (J) rebasing 7:cf89f86b485b J "J"
rebasing 2:112478962961 "B" (B) rebasing 2:112478962961 B "B"
rebasing 3:7fb047a69f22 "E" (E) rebasing 3:7fb047a69f22 E "E"
rebasing 8:f585351a92f8 "D" (D) rebasing 8:f585351a92f8 D "D"
rebasing 10:ae41898d7875 "K" (K tip) rebasing 10:ae41898d7875 K tip "K"
rebasing 9:711f53bbef0b "G" (G) rebasing 9:711f53bbef0b G "G"
rebasing 6:64a8289d2492 "F" (F) rebasing 6:64a8289d2492 F "F"
o 21: 3735afb3713a F o 21: 3735afb3713a F
| |
o 20: 07698142d7a7 G o 20: 07698142d7a7 G
| |
o 19: 33aba52e7e72 K o 19: 33aba52e7e72 K
| |
o 18: 9fdae89dc5a1 D o 18: 9fdae89dc5a1 D
| |
> | |/ # rebase: B -> B2 > | |/ # rebase: B -> B2
> N C # amend: E -> E2 > N C # amend: E -> E2
> | | # amend: E2 -> E3 > | | # amend: E2 -> E3
> M B # rebase: F -> F2 > M B # rebase: F -> F2
> \| # amend: I -> I2 > \| # amend: I -> I2
> A > A
> EOF > EOF
6 new orphan changesets 6 new orphan changesets
rebasing 16:5c432343bf59 "J" (J tip) rebasing 16:5c432343bf59 J tip "J"
rebasing 3:26805aba1e60 "C" (C) rebasing 3:26805aba1e60 C "C"
rebasing 6:f585351a92f8 "D" (D) rebasing 6:f585351a92f8 D "D"
rebasing 10:ffebc37c5d0b "E3" (E3) rebasing 10:ffebc37c5d0b E3 "E3"
rebasing 13:fb184bcfeee8 "F2" (F2) rebasing 13:fb184bcfeee8 F2 "F2"
rebasing 11:dc838ab4c0da "G" (G) rebasing 11:dc838ab4c0da G "G"
o 22: 174f63d574a8 G o 22: 174f63d574a8 G
| |
o 21: c9d9fbe76705 F2 o 21: c9d9fbe76705 F2
| |
o 20: 0a03c2ede755 E3 o 20: 0a03c2ede755 E3
| |
o 19: 228d9d2541b1 D o 19: 228d9d2541b1 D
| |

tests/test-rebase-detach.t

> | > |
> C B > C B
> |/ > |/
> A > A
> EOF > EOF
$ hg phase --force --secret D $ hg phase --force --secret D
$ hg rebase -s D -d B $ hg rebase -s D -d B
rebasing 3:e7b3f00ed42e "D" (D tip) rebasing 3:e7b3f00ed42e D tip "D"
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/e7b3f00ed42e-6f368371-rebase.hg saved backup bundle to $TESTTMP/a1/.hg/strip-backup/e7b3f00ed42e-6f368371-rebase.hg
$ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n"
o 3:secret 'D' o 3:secret 'D'
| |
| o 2:draft 'C' | o 2:draft 'C'
| | | |
o | 1:draft 'B' o | 1:draft 'B'
> D > D
> | > |
> C B > C B
> |/ > |/
> A > A
> EOF > EOF
$ hg rebase -s D -d B $ hg rebase -s D -d B
rebasing 3:e7b3f00ed42e "D" (D) rebasing 3:e7b3f00ed42e D "D"
rebasing 4:69a34c08022a "E" (E tip) rebasing 4:69a34c08022a E tip "E"
saved backup bundle to $TESTTMP/a2/.hg/strip-backup/e7b3f00ed42e-a2ec7cea-rebase.hg saved backup bundle to $TESTTMP/a2/.hg/strip-backup/e7b3f00ed42e-a2ec7cea-rebase.hg
$ hg tglog $ hg tglog
o 4: ee79e0744528 'E' o 4: ee79e0744528 'E'
| |
o 3: 10530e1d72d9 'D' o 3: 10530e1d72d9 'D'
| |
| o 2: dc0947a82db8 'C' | o 2: dc0947a82db8 'C'
> D > D
> | > |
> C B > C B
> |/ > |/
> A > A
> EOF > EOF
$ hg rebase -s C -d B $ hg rebase -s C -d B
rebasing 2:dc0947a82db8 "C" (C) rebasing 2:dc0947a82db8 C "C"
rebasing 3:e7b3f00ed42e "D" (D tip) rebasing 3:e7b3f00ed42e D tip "D"
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/dc0947a82db8-b8481714-rebase.hg saved backup bundle to $TESTTMP/a3/.hg/strip-backup/dc0947a82db8-b8481714-rebase.hg
$ hg tglog $ hg tglog
o 3: 7375f3dbfb0f 'D' o 3: 7375f3dbfb0f 'D'
| |
o 2: bbfdd6cb49aa 'C' o 2: bbfdd6cb49aa 'C'
| |
o 1: 112478962961 'B' o 1: 112478962961 'B'
> | > |
> C B > C B
> |/ > |/
> A > A
> EOF > EOF
$ hg phase --force --secret E $ hg phase --force --secret E
$ hg rebase --collapse -s D -d B $ hg rebase --collapse -s D -d B
rebasing 3:e7b3f00ed42e "D" (D) rebasing 3:e7b3f00ed42e D "D"
rebasing 4:69a34c08022a "E" (E tip) rebasing 4:69a34c08022a E tip "E"
saved backup bundle to $TESTTMP/a4/.hg/strip-backup/e7b3f00ed42e-a2ec7cea-rebase.hg saved backup bundle to $TESTTMP/a4/.hg/strip-backup/e7b3f00ed42e-a2ec7cea-rebase.hg
$ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n"
o 3:secret 'Collapsed revision o 3:secret 'Collapsed revision
| * D | * D
| * E' | * E'
| o 2:draft 'C' | o 2:draft 'C'
| | | |
> D > D
> | > |
> C > C
> | > |
> A B > A B
> EOF > EOF
$ hg rebase -s C -d B $ hg rebase -s C -d B
rebasing 2:dc0947a82db8 "C" (C) rebasing 2:dc0947a82db8 C "C"
rebasing 3:e7b3f00ed42e "D" (D) rebasing 3:e7b3f00ed42e D "D"
rebasing 4:69a34c08022a "E" (E tip) rebasing 4:69a34c08022a E tip "E"
saved backup bundle to $TESTTMP/a5/.hg/strip-backup/dc0947a82db8-3eefec98-rebase.hg saved backup bundle to $TESTTMP/a5/.hg/strip-backup/dc0947a82db8-3eefec98-rebase.hg
$ hg tglog $ hg tglog
o 4: e3d0c70d606d 'E' o 4: e3d0c70d606d 'E'
| |
o 3: e9153d36a1af 'D' o 3: e9153d36a1af 'D'
| |
o 2: a7ac28b870a8 'C' o 2: a7ac28b870a8 'C'
| |
o 1: fc2b737bb2e5 'B' o 1: fc2b737bb2e5 'B'
o 0: 426bada5c675 'A' o 0: 426bada5c675 'A'
$ hg rebase -d 1 -s 3 $ hg rebase -d 1 -s 3
rebasing 3:e9153d36a1af "D" rebasing 3:e9153d36a1af "D"
rebasing 4:e3d0c70d606d "E" (tip) rebasing 4:e3d0c70d606d tip "E"
saved backup bundle to $TESTTMP/a5/.hg/strip-backup/e9153d36a1af-db7388ed-rebase.hg saved backup bundle to $TESTTMP/a5/.hg/strip-backup/e9153d36a1af-db7388ed-rebase.hg
$ hg tglog $ hg tglog
o 4: 2c24e540eccd 'E' o 4: 2c24e540eccd 'E'
| |
o 3: 73f786ed52ff 'D' o 3: 73f786ed52ff 'D'
| |
| o 2: a7ac28b870a8 'C' | o 2: a7ac28b870a8 'C'
|/ |/
|/| |/|
o | 2: 8908a377a434 'F' o | 2: 8908a377a434 'F'
| | | |
| o 1: 7fb047a69f22 'E' | o 1: 7fb047a69f22 'E'
|/ |/
o 0: 426bada5c675 'A' o 0: 426bada5c675 'A'
$ hg rebase -s I -d H --collapse --config ui.merge=internal:other $ hg rebase -s I -d H --collapse --config ui.merge=internal:other
rebasing 5:b92d164ad3cb "I" (I) rebasing 5:b92d164ad3cb I "I"
rebasing 6:0cfbc7e8faaf "Merge" rebasing 6:0cfbc7e8faaf "Merge"
rebasing 7:c6aaf0d259c0 "J" (tip) rebasing 7:c6aaf0d259c0 tip "J"
saved backup bundle to $TESTTMP/a6/.hg/strip-backup/b92d164ad3cb-88fd7ab7-rebase.hg saved backup bundle to $TESTTMP/a6/.hg/strip-backup/b92d164ad3cb-88fd7ab7-rebase.hg
$ hg tglog $ hg tglog
@ 5: 65079693dac4 'Collapsed revision @ 5: 65079693dac4 'Collapsed revision
| * I | * I
| * Merge | * Merge
| * J' | * J'
o 4: 4ea5b230dea3 'H' o 4: 4ea5b230dea3 'H'
> A > A
> EOF > EOF
$ hg up -q C $ hg up -q C
$ echo 'B2' > B $ echo 'B2' > B
$ hg ci -A -m 'B2' $ hg ci -A -m 'B2'
adding B adding B
$ hg phase --force --secret . $ hg phase --force --secret .
$ hg rebase -s . -d B --config ui.merge=internal:merge $ hg rebase -s . -d B --config ui.merge=internal:merge
rebasing 3:17b4880d2402 "B2" (tip) rebasing 3:17b4880d2402 tip "B2"
merging B merging B
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 tip "B2"
note: not rebasing 3:17b4880d2402 "B2" (tip), its destination already has all its changes note: not rebasing 3:17b4880d2402 tip "B2", 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-empty-successor.t

|/ |/
o 0 'a' o 0 'a'
With rewrite.empty-successor=skip, b2 is skipped because it would become empty. With rewrite.empty-successor=skip, b2 is skipped because it would become empty.
$ hg rebase -s 2 -d 1 --config rewrite.empty-successor=skip --dry-run $ hg rebase -s 2 -d 1 --config rewrite.empty-successor=skip --dry-run
starting dry-run rebase; repository will not be changed starting dry-run rebase; repository will not be changed
rebasing 2:6e2aad5e0f3c "b2" (tip) rebasing 2:6e2aad5e0f3c tip "b2"
note: not rebasing 2:6e2aad5e0f3c "b2" (tip), its destination already has all its changes note: not rebasing 2:6e2aad5e0f3c tip "b2", its destination already has all its changes
dry-run rebase completed successfully; run without -n/--dry-run to perform this rebase dry-run rebase completed successfully; run without -n/--dry-run to perform this rebase
With rewrite.empty-successor=keep, b2 will be recreated although it became empty. With rewrite.empty-successor=keep, b2 will be recreated although it became empty.
$ hg rebase -s 2 -d 1 --config rewrite.empty-successor=keep $ hg rebase -s 2 -d 1 --config rewrite.empty-successor=keep
rebasing 2:6e2aad5e0f3c "b2" (tip) rebasing 2:6e2aad5e0f3c tip "b2"
note: created empty successor for 2:6e2aad5e0f3c "b2" (tip), its destination already has all its changes note: created empty successor for 2:6e2aad5e0f3c tip "b2", its destination already has all its changes
saved backup bundle to $TESTTMP/.hg/strip-backup/6e2aad5e0f3c-7d7c8801-rebase.hg saved backup bundle to $TESTTMP/.hg/strip-backup/6e2aad5e0f3c-7d7c8801-rebase.hg
$ hg tglog $ hg tglog
@ 2 'b2' @ 2 'b2'
| |
o 1 'b1' o 1 'b1'
| |
o 0 'a' o 0 'a'

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 BOOK-D "D"
note: not rebasing 3:e7b3f00ed42e "D" (BOOK-D), its destination already has all its changes note: not rebasing 3:e7b3f00ed42e BOOK-D "D", its destination already has all its changes
rebasing 4:69a34c08022a "E" (BOOK-E) rebasing 4:69a34c08022a BOOK-E "E"
note: not rebasing 4:69a34c08022a "E" (BOOK-E), its destination already has all its changes note: not rebasing 4:69a34c08022a BOOK-E "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
$ hg bookmark BOOK-E -fqir 4 $ hg bookmark BOOK-E -fqir 4
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 BOOK-D "D"
note: not rebasing 3:e7b3f00ed42e "D" (BOOK-D), its destination already has all its changes note: not rebasing 3:e7b3f00ed42e BOOK-D "D", its destination already has all its changes
rebasing 4:69a34c08022a "E" (BOOK-E) rebasing 4:69a34c08022a BOOK-E "E"
note: not rebasing 4:69a34c08022a "E" (BOOK-E), its destination already has all its changes note: not rebasing 4:69a34c08022a BOOK-E "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
| |
should stay unchanged if --keepbranches is passed), and erroneously assumed should stay unchanged if --keepbranches is passed), and erroneously assumed
that an otherwise empty changeset should be created because of the incorrectly that an otherwise empty changeset should be created because of the incorrectly
assumed branch name change. assumed branch name change.
$ hg update H -q $ hg update H -q
$ hg branch foo -q $ hg branch foo -q
$ hg rebase -r '(A::)-(B::)-A' -d H --keepbranches $ hg rebase -r '(A::)-(B::)-A' -d H --keepbranches
rebasing 2:dc0947a82db8 "C" (BOOK-C) rebasing 2:dc0947a82db8 BOOK-C "C"
note: not rebasing 2:dc0947a82db8 "C" (BOOK-C), its destination already has all its changes note: not rebasing 2:dc0947a82db8 BOOK-C "C", its destination already has all its changes
rebasing 3:b18e25de2cf5 "D" (BOOK-D) rebasing 3:b18e25de2cf5 BOOK-D "D"
note: not rebasing 3:b18e25de2cf5 "D" (BOOK-D), its destination already has all its changes note: not rebasing 3:b18e25de2cf5 BOOK-D "D", its destination already has all its changes
rebasing 4:86a1f6686812 "E" (BOOK-E E) rebasing 4:86a1f6686812 E BOOK-E "E"
note: not rebasing 4:86a1f6686812 "E" (BOOK-E E), its destination already has all its changes 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 update null -q $ hg update null -q
$ 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
| |
> F > F
> | > |
> 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 BOOK-C "C"
note: not rebasing 2:dc0947a82db8 "C" (BOOK-C), its destination already has all its changes note: not rebasing 2:dc0947a82db8 BOOK-C "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 BOOK-F "F"
note: not rebasing 5:ad6717a6a58e "F" (BOOK-F), its destination already has all its changes note: not rebasing 5:ad6717a6a58e BOOK-F "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
| | | |
o | 5 D BOOK-D BOOK-F o | 5 D BOOK-D BOOK-F

tests/test-rebase-inmemory.t

@ 0: b173517d0057 'a' @ 0: b173517d0057 'a'
$ hg cat -r 3 c $ hg cat -r 3 c
c (no-eol) c (no-eol)
$ hg cat -r 2 b $ hg cat -r 2 b
b (no-eol) b (no-eol)
$ hg rebase --debug -r b -d c | grep rebasing $ hg rebase --debug -r b -d c | grep rebasing
rebasing in memory rebasing in memory
rebasing 2:db0e82a16a62 "b" (b) rebasing 2:db0e82a16a62 b "b"
$ hg tglog $ hg tglog
o 3: ca58782ad1e4 'b' o 3: ca58782ad1e4 'b'
| |
o 2: 814f6bd05178 'c' o 2: 814f6bd05178 'c'
| |
o 1: 02952614a83d 'd' o 1: 02952614a83d 'd'
| |
@ 0: b173517d0057 'a' @ 0: b173517d0057 'a'
$ hg cat -r 3 c $ hg cat -r 3 c
c (no-eol) c (no-eol)
$ hg cat -r 2 b $ hg cat -r 2 b
b (no-eol) b (no-eol)
$ hg cat -r 3 e $ hg cat -r 3 e
somefile (no-eol) somefile (no-eol)
$ hg rebase --debug -s b -d a | grep rebasing $ hg rebase --debug -s b -d a | grep rebasing
rebasing in memory rebasing in memory
rebasing 2:db0e82a16a62 "b" (b) rebasing 2:db0e82a16a62 b "b"
$ hg tglog $ hg tglog
o 3: fc055c3b4d33 'b' o 3: fc055c3b4d33 'b'
| |
| o 2: f56b71190a8f 'c' | o 2: f56b71190a8f 'c'
| | | |
| o 1: 02952614a83d 'd' | o 1: 02952614a83d 'd'
|/ |/
@ 0: b173517d0057 'a' @ 0: b173517d0057 'a'
$ hg cat -r 2 c $ hg cat -r 2 c
c (no-eol) c (no-eol)
$ hg cat -r 3 b $ hg cat -r 3 b
b (no-eol) b (no-eol)
$ hg rebase --debug -s 1 -d 3 | grep rebasing $ hg rebase --debug -s 1 -d 3 | grep rebasing
rebasing in memory rebasing in memory
rebasing 1:02952614a83d "d" (d) rebasing 1:02952614a83d d "d"
rebasing 2:f56b71190a8f "c" rebasing 2:f56b71190a8f "c"
$ hg tglog $ hg tglog
o 3: 753feb6fd12a 'c' o 3: 753feb6fd12a 'c'
| |
o 2: 09c044d2cb43 'd' o 2: 09c044d2cb43 'd'
| |
o 1: fc055c3b4d33 'b' o 1: fc055c3b4d33 'b'
| |
$ ls -l f | cut -c -10 $ ls -l f | cut -c -10
-rwxr-xr-x -rwxr-xr-x
Rebase the working copy parent Rebase the working copy parent
$ hg up -C 3 $ hg up -C 3
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 rebase -r 3 -d 0 --debug | grep rebasing $ hg rebase -r 3 -d 0 --debug | grep rebasing
rebasing in memory rebasing in memory
rebasing 3:753feb6fd12a "c" (tip) rebasing 3:753feb6fd12a tip "c"
$ hg tglog $ hg tglog
@ 3: 844a7de3e617 'c' @ 3: 844a7de3e617 'c'
| |
| o 2: 09c044d2cb43 'd' | o 2: 09c044d2cb43 'd'
| | | |
| o 1: fc055c3b4d33 'b' | o 1: fc055c3b4d33 'b'
|/ |/
o 0: b173517d0057 'a' o 0: b173517d0057 'a'
| |
| o 2: 09c044d2cb43 'd' | o 2: 09c044d2cb43 'd'
| | | |
| o 1: fc055c3b4d33 'b' | o 1: fc055c3b4d33 'b'
|/ |/
o 0: b173517d0057 'a' o 0: b173517d0057 'a'
$ hg rebase -r . -d 2 $ hg rebase -r . -d 2
rebasing 4:daf7dfc139cb "a/a" (tip) rebasing 4:daf7dfc139cb tip "a/a"
saved backup bundle to $TESTTMP/repo2/.hg/strip-backup/daf7dfc139cb-fdbfcf4f-rebase.hg saved backup bundle to $TESTTMP/repo2/.hg/strip-backup/daf7dfc139cb-fdbfcf4f-rebase.hg
$ hg tglog $ hg tglog
@ 4: c6ad37a4f250 'a/a' @ 4: c6ad37a4f250 'a/a'
| |
| o 3: 844a7de3e617 'c' | o 3: 844a7de3e617 'c'
| | | |
o | 2: 09c044d2cb43 'd' o | 2: 09c044d2cb43 'd'
| | | |
o | 2: 09c044d2cb43 'd' o | 2: 09c044d2cb43 'd'
| | | |
o | 1: fc055c3b4d33 'b' o | 1: fc055c3b4d33 'b'
|/ |/
o 0: b173517d0057 'a' o 0: b173517d0057 'a'
$ hg rebase -r . -d 5 $ hg rebase -r . -d 5
rebasing 7:855e9797387e "added a back!" (tip) rebasing 7:855e9797387e tip "added a back!"
saved backup bundle to $TESTTMP/repo2/.hg/strip-backup/855e9797387e-81ee4c5d-rebase.hg saved backup bundle to $TESTTMP/repo2/.hg/strip-backup/855e9797387e-81ee4c5d-rebase.hg
$ hg tglog $ hg tglog
@ 7: bb3f02be2688 'added a back!' @ 7: bb3f02be2688 'added a back!'
| |
| o 6: d14530e5e3e6 'added bar' | o 6: d14530e5e3e6 'added bar'
| | | |
o | 5: 9b94b9373deb 'added foo' o | 5: 9b94b9373deb 'added foo'
o 0: b173517d0057 'a' o 0: b173517d0057 'a'
$ mkdir -p c/subdir $ mkdir -p c/subdir
$ echo c > c/subdir/file.txt $ echo c > c/subdir/file.txt
$ hg add c/subdir/file.txt $ hg add c/subdir/file.txt
$ hg ci -m 'c/subdir/file.txt' $ hg ci -m 'c/subdir/file.txt'
$ hg rebase -r . -d 3 -n $ hg rebase -r . -d 3 -n
starting dry-run rebase; repository will not be changed starting dry-run rebase; repository will not be changed
rebasing 8:e147e6e3c490 "c/subdir/file.txt" (tip) rebasing 8:e147e6e3c490 tip "c/subdir/file.txt"
abort: error: 'c/subdir/file.txt' conflicts with file 'c' in 3. abort: error: 'c/subdir/file.txt' conflicts with file 'c' in 3.
[255] [255]
FIXME: shouldn't need this, but when we hit path conflicts in dryrun mode, we FIXME: shouldn't need this, but when we hit path conflicts in dryrun mode, we
don't clean up rebasestate. don't clean up rebasestate.
$ hg rebase --abort $ hg rebase --abort
rebase aborted rebase aborted
$ hg rebase -r 3 -d . -n $ hg rebase -r 3 -d . -n
starting dry-run rebase; repository will not be changed starting dry-run rebase; repository will not be changed
$ hg ci -qAm r0 $ hg ci -qAm r0
$ echo hi > bar.txt $ echo hi > bar.txt
$ hg ci -qAm r1 $ hg ci -qAm r1
$ hg co -qr ".^" $ hg co -qr ".^"
$ chmod +x foo.txt $ chmod +x foo.txt
$ hg ci -qAm 'add +x to foo.txt' $ hg ci -qAm 'add +x to foo.txt'
issue5960: this was raising an AttributeError exception issue5960: this was raising an AttributeError exception
$ hg rebase -r . -d 1 $ hg rebase -r . -d 1
rebasing 2:539b93e77479 "add +x to foo.txt" (tip) rebasing 2:539b93e77479 tip "add +x to foo.txt"
saved backup bundle to $TESTTMP/no_exception/.hg/strip-backup/*.hg (glob) saved backup bundle to $TESTTMP/no_exception/.hg/strip-backup/*.hg (glob)
$ hg diff -c tip $ hg diff -c tip
diff --git a/foo.txt b/foo.txt diff --git a/foo.txt b/foo.txt
old mode 100644 old mode 100644
new mode 100755 new mode 100755
Test rebasing a commit with copy information, but no content changes Test rebasing a commit with copy information, but no content changes
$ echo a > a $ echo a > a
$ hg ci -Aqm 'add a' $ hg ci -Aqm 'add a'
$ echo a2 > a $ echo a2 > a
$ hg ci -m 'modify a' $ hg ci -m 'modify a'
$ hg co -q 0 $ hg co -q 0
$ hg mv a b $ hg mv a b
$ hg ci -qm 'rename a to b' $ hg ci -qm 'rename a to b'
$ hg rebase -d 1 $ hg rebase -d 1
rebasing 2:b977edf6f839 "rename a to b" (tip) rebasing 2:b977edf6f839 tip "rename a to b"
merging a and b to b merging a and b to b
saved backup bundle to $TESTTMP/rebase-rename/.hg/strip-backup/b977edf6f839-0864f570-rebase.hg saved backup bundle to $TESTTMP/rebase-rename/.hg/strip-backup/b977edf6f839-0864f570-rebase.hg
$ hg st --copies --change . $ hg st --copies --change .
A b A b
a a
R a R a
$ cd .. $ cd ..
Test rebasing a commit with copy information, where the target is empty Test rebasing a commit with copy information, where the target is empty
$ hg init rebase-rename-empty $ hg init rebase-rename-empty
$ cd rebase-rename-empty $ cd rebase-rename-empty
$ echo a > a $ echo a > a
$ hg ci -Aqm 'add a' $ hg ci -Aqm 'add a'
$ cat > a $ cat > a
$ hg ci -m 'make a empty' $ hg ci -m 'make a empty'
$ hg co -q 0 $ hg co -q 0
$ hg mv a b $ hg mv a b
$ hg ci -qm 'rename a to b' $ hg ci -qm 'rename a to b'
$ hg rebase -d 1 $ hg rebase -d 1
rebasing 2:b977edf6f839 "rename a to b" (tip) rebasing 2:b977edf6f839 tip "rename a to b"
merging a and b to b merging a and b to b
saved backup bundle to $TESTTMP/rebase-rename-empty/.hg/strip-backup/b977edf6f839-0864f570-rebase.hg saved backup bundle to $TESTTMP/rebase-rename-empty/.hg/strip-backup/b977edf6f839-0864f570-rebase.hg
$ hg st --copies --change . $ hg st --copies --change .
A b A b
a a
R a R a
$ cd .. $ cd ..
Rebase across a copy with --collapse Rebase across a copy with --collapse
$ hg init rebase-rename-collapse $ hg init rebase-rename-collapse
$ cd rebase-rename-collapse $ cd rebase-rename-collapse
$ echo a > a $ echo a > a
$ hg ci -Aqm 'add a' $ hg ci -Aqm 'add a'
$ hg mv a b $ hg mv a b
$ hg ci -m 'rename a to b' $ hg ci -m 'rename a to b'
$ hg co -q 0 $ hg co -q 0
$ echo a2 > a $ echo a2 > a
$ hg ci -qm 'modify a' $ hg ci -qm 'modify a'
$ hg rebase -r . -d 1 --collapse $ hg rebase -r . -d 1 --collapse
rebasing 2:41c4ea50d4cf "modify a" (tip) rebasing 2:41c4ea50d4cf tip "modify a"
merging b and a to b merging b and a to b
saved backup bundle to $TESTTMP/rebase-rename-collapse/.hg/strip-backup/41c4ea50d4cf-b90b7994-rebase.hg saved backup bundle to $TESTTMP/rebase-rename-collapse/.hg/strip-backup/41c4ea50d4cf-b90b7994-rebase.hg
$ cd .. $ cd ..
Test rebasing when the file we are merging in destination is empty Test rebasing when the file we are merging in destination is empty
$ hg init test $ hg init test
$ cd test $ cd test
+++ b/foo +++ b/foo
@@ -1,1 +1,1 @@ @@ -1,1 +1,1 @@
-a -a
+b +b
$ hg ci -m "add b to foo" $ hg ci -m "add b to foo"
created new head created new head
$ hg rebase -r . -d 1 --config ui.merge=internal:merge3 $ hg rebase -r . -d 1 --config ui.merge=internal:merge3
rebasing 2:fb62b706688e "add b to foo" (tip) rebasing 2:fb62b706688e tip "add b to foo"
merging foo merging foo
hit merge conflicts; rebasing that commit again in the working copy hit merge conflicts; rebasing that commit again in the working copy
merging foo merging foo
warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') warning: conflicts while merging foo! (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]
$ cd $TESTTMP $ cd $TESTTMP
| |/ | |/
o / 1: 6f252845ea45 'a' o / 1: 6f252845ea45 'a'
|/ |/
o 0: d20a80d4def3 'base' o 0: d20a80d4def3 'base'
$ hg rebase -s 2 -d 3 $ hg rebase -s 2 -d 3
rebasing 2:0194f1db184a "b" rebasing 2:0194f1db184a "b"
note: not rebasing 2:0194f1db184a "b", its destination already has all its changes note: not rebasing 2:0194f1db184a "b", its destination already has all its changes
rebasing 4:59c8292117b1 "merge" (tip) rebasing 4:59c8292117b1 tip "merge"
saved backup bundle to $TESTTMP/keep_merge/.hg/strip-backup/0194f1db184a-aee31d03-rebase.hg saved backup bundle to $TESTTMP/keep_merge/.hg/strip-backup/0194f1db184a-aee31d03-rebase.hg
$ hg tglog $ hg tglog
o 3: 506e2454484b 'merge' o 3: 506e2454484b 'merge'
|\ |\
| o 2: 531f80391e4a 'c' | o 2: 531f80391e4a 'c'
| | | |
o | 1: 6f252845ea45 'a' o | 1: 6f252845ea45 'a'
|/ |/
$ hg init nofilechanges $ hg init nofilechanges
$ cd nofilechanges $ cd nofilechanges
$ echo a > a; hg add a; hg ci -m a $ echo a > a; hg add a; hg ci -m a
$ echo foo > test; hg add test; hg ci -m b $ echo foo > test; hg add test; hg ci -m b
$ hg up 0 -q $ hg up 0 -q
$ echo bar > test; hg add test; hg ci -m c $ echo bar > test; hg add test; hg ci -m c
created new head created new head
$ hg rebase -d 2 -d 1 --tool :local $ hg rebase -d 2 -d 1 --tool :local
rebasing 2:ca2749322ee5 "c" (tip) rebasing 2:ca2749322ee5 tip "c"
note: not rebasing 2:ca2749322ee5 "c" (tip), its destination already has all its changes note: not rebasing 2:ca2749322ee5 tip "c", its destination already has all its changes
saved backup bundle to $TESTTMP/nofilechanges/.hg/strip-backup/ca2749322ee5-6dc7e94b-rebase.hg saved backup bundle to $TESTTMP/nofilechanges/.hg/strip-backup/ca2749322ee5-6dc7e94b-rebase.hg

tests/test-rebase-interruptions.t

(precommit version) (precommit version)
$ cp -R a3 hook-precommit $ cp -R a3 hook-precommit
$ cd hook-precommit $ cd hook-precommit
$ hg rebase --source 2 --dest 5 --tool internal:other --config 'hooks.precommit=hg status | grep "M A"' $ hg rebase --source 2 --dest 5 --tool internal:other --config 'hooks.precommit=hg status | grep "M A"'
rebasing 2:965c486023db "C" rebasing 2:965c486023db "C"
M A M A
rebasing 6:a0b2430ebfb8 "F" (tip) rebasing 6:a0b2430ebfb8 tip "F"
abort: precommit hook exited with status 1 abort: precommit hook exited with status 1
[255] [255]
$ hg tglogp $ hg tglogp
@ 7: 401ccec5e39f secret 'C' @ 7: 401ccec5e39f secret 'C'
| |
| o 6: a0b2430ebfb8 secret 'F' | o 6: a0b2430ebfb8 secret 'F'
| | | |
o | 5: 45396c49d53b public 'B' o | 5: 45396c49d53b public 'B'
(pretxncommit version) (pretxncommit version)
$ cp -R a3 hook-pretxncommit $ cp -R a3 hook-pretxncommit
$ cd hook-pretxncommit $ cd hook-pretxncommit
$ hg rebase --source 2 --dest 5 --tool internal:other \ $ hg rebase --source 2 --dest 5 --tool internal:other \
> --config 'hooks.tonative.pretxncommit=True' --config 'hooks.pretxncommit=hg log -r $HG_NODE | grep "summary: C"' > --config 'hooks.tonative.pretxncommit=True' --config 'hooks.pretxncommit=hg log -r $HG_NODE | grep "summary: C"'
rebasing 2:965c486023db "C" rebasing 2:965c486023db "C"
summary: C summary: C
rebasing 6:a0b2430ebfb8 "F" (tip) rebasing 6:a0b2430ebfb8 tip "F"
transaction abort! transaction abort!
rollback completed rollback completed
abort: pretxncommit hook exited with status 1 abort: pretxncommit hook exited with status 1
[255] [255]
$ hg tglogp $ hg tglogp
@ 7: 401ccec5e39f secret 'C' @ 7: 401ccec5e39f secret 'C'
| |
| o 6: a0b2430ebfb8 secret 'F' | o 6: a0b2430ebfb8 secret 'F'
(pretxnclose version) (pretxnclose version)
$ cp -R a3 hook-pretxnclose $ cp -R a3 hook-pretxnclose
$ cd hook-pretxnclose $ cd hook-pretxnclose
$ hg rebase --source 2 --dest 5 --tool internal:other --config 'hooks.pretxnclose=hg log -r tip | grep "summary: C"' $ hg rebase --source 2 --dest 5 --tool internal:other --config 'hooks.pretxnclose=hg log -r tip | grep "summary: C"'
rebasing 2:965c486023db "C" rebasing 2:965c486023db "C"
summary: C summary: C
rebasing 6:a0b2430ebfb8 "F" (tip) rebasing 6:a0b2430ebfb8 tip "F"
transaction abort! transaction abort!
rollback completed rollback completed
abort: pretxnclose hook exited with status 1 abort: pretxnclose hook exited with status 1
[255] [255]
$ hg tglogp $ hg tglogp
@ 7: 401ccec5e39f secret 'C' @ 7: 401ccec5e39f secret 'C'
| |
| o 6: a0b2430ebfb8 secret 'F' | o 6: a0b2430ebfb8 secret 'F'
note: not rebasing 1:fdaca8533b86 "b", its destination already has all its changes 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 tip "b"
merging a merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a! (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]
$ 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 2:fdaca8533b86 "b" (tip) rebasing 2:fdaca8533b86 tip "b"
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]

tests/test-rebase-legacy.t

> EOF > EOF
#if continuecommand #if continuecommand
$ hg continue --dry-run $ hg continue --dry-run
rebase in progress, will be resumed rebase in progress, will be resumed
#endif #endif
$ hg continue $ hg continue
rebasing 4:c1e6b162678d "B" (B) rebasing 4:c1e6b162678d B "B"
rebasing 8:6f7a236de685 "D" (D) rebasing 8:6f7a236de685 D "D"
rebasing 2:de008c61a447 "E" (E) rebasing 2:de008c61a447 E "E"
rebasing 7:d2fa1c02b240 "G" (G) rebasing 7:d2fa1c02b240 G "G"
rebasing 9:6582e6951a9c "H" (H tip) rebasing 9:6582e6951a9c H tip "H"
warning: orphaned descendants detected, not stripping c1e6b162678d, de008c61a447 warning: orphaned descendants detected, not stripping c1e6b162678d, de008c61a447
saved backup bundle to $TESTTMP/.hg/strip-backup/6f7a236de685-9880a3dc-rebase.hg saved backup bundle to $TESTTMP/.hg/strip-backup/6f7a236de685-9880a3dc-rebase.hg
$ hg log -G -T '{rev}:{node|short} {desc}\n' $ hg log -G -T '{rev}:{node|short} {desc}\n'
o 11:721b8da0a708 H o 11:721b8da0a708 H
| |
o 10:9d65695ec3c2 G o 10:9d65695ec3c2 G
| |

tests/test-rebase-mq-skip.t

$ hg import p1.patch $ hg import p1.patch
applying p1.patch applying p1.patch
$ rm p1.patch $ rm p1.patch
$ hg up -q -C qtip $ hg up -q -C qtip
$ hg rebase -v $ hg rebase -v
rebasing 2:13a46ce44f60 "P0" (p0.patch qbase) rebasing 2:13a46ce44f60 p0.patch qbase "P0"
resolving manifests resolving manifests
removing p0 removing p0
getting r1 getting r1
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.patch qtip "P1"
resolving manifests resolving manifests
note: not rebasing 3:148775c71080 "P1" (p1.patch qtip), its destination already has all its changes note: not rebasing 3:148775c71080 p1.patch qtip "P1", 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 qbase r1 "r1"
note: not rebasing 1:b4bffa6e4776 "r1" (qbase r1), its destination already has all its changes note: not rebasing 1:b4bffa6e4776 qbase r1 "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: not rebasing 3:6ff5b8feed8e "r3" (r3), its destination already has all its changes 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 continue $ hg continue
already rebased 1:b4bffa6e4776 "r1" (qbase r1) as 057f55ff8f44 already rebased 1:b4bffa6e4776 qbase r1 "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: not rebasing 4:094320fec554 "r4" (r4), its destination already has all its changes 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 qtip r6 "r6"
note: not rebasing 6:512a1f24768b "r6" (qtip r6), its destination already has all its changes note: not rebasing 6:512a1f24768b qtip r6 "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 rebase $ hg rebase
abort: cannot rebase onto an applied mq patch abort: cannot rebase onto an applied mq patch
[255] [255]
$ hg up -q qtip $ hg up -q qtip
Rebase - generate a conflict: Rebase - generate a conflict:
$ hg rebase -s 2 -d 1 $ hg rebase -s 2 -d 1
rebasing 2:3504f44bffc0 "P0" (f.patch qbase) rebasing 2:3504f44bffc0 f.patch qbase "P0"
merging f merging f
warning: conflicts while merging f! (edit, then use 'hg resolve --mark') warning: conflicts while merging f! (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]
Fix the 1st conflict: Fix the 1st conflict:
$ echo mq1r1 > f $ echo mq1r1 > f
$ hg resolve -m f $ hg resolve -m f
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase -c $ hg rebase -c
rebasing 2:3504f44bffc0 "P0" (f.patch qbase) rebasing 2:3504f44bffc0 f.patch qbase "P0"
rebasing 3:929394423cd3 "P1" (f2.patch qtip tip) rebasing 3:929394423cd3 f2.patch qtip tip "P1"
merging f merging f
warning: conflicts while merging f! (edit, then use 'hg resolve --mark') warning: conflicts while merging f! (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]
Fix the 2nd conflict: Fix the 2nd conflict:
$ echo mq1r1mq2 > f $ echo mq1r1mq2 > f
$ hg resolve -m f $ hg resolve -m f
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase -c $ hg rebase -c
already rebased 2:3504f44bffc0 "P0" (f.patch qbase) as ebe9914c0d1c already rebased 2:3504f44bffc0 f.patch qbase "P0" as ebe9914c0d1c
rebasing 3:929394423cd3 "P1" (f2.patch qtip) rebasing 3:929394423cd3 f2.patch qtip "P1"
saved backup bundle to $TESTTMP/a/.hg/strip-backup/3504f44bffc0-30595b40-rebase.hg saved backup bundle to $TESTTMP/a/.hg/strip-backup/3504f44bffc0-30595b40-rebase.hg
$ hg tglog $ hg tglog
@ 3: 462012cf340c 'P1' tags: f2.patch qtip tip @ 3: 462012cf340c 'P1' tags: f2.patch qtip tip
| |
o 2: ebe9914c0d1c 'P0' tags: f.patch qbase o 2: ebe9914c0d1c 'P0' tags: f.patch qbase
| |
o 1: bac9ed9960d8 'R1' tags: qparent o 1: bac9ed9960d8 'R1' tags: qparent
@@ -1,1 +1,1 @@ @@ -1,1 +1,1 @@
-mq1 -mq1
+mq2 +mq2
Rebase the applied mq patches: Rebase the applied mq patches:
$ hg rebase -s 2 -d 1 $ hg rebase -s 2 -d 1
rebasing 2:0c587ffcb480 "P0 (git)" (f_git.patch qbase) rebasing 2:0c587ffcb480 f_git.patch qbase "P0 (git)"
rebasing 3:c7f18665e4bc "P1" (f.patch qtip tip) rebasing 3:c7f18665e4bc f.patch qtip tip "P1"
saved backup bundle to $TESTTMP/a/.hg/strip-backup/0c587ffcb480-0ea5695f-rebase.hg saved backup bundle to $TESTTMP/a/.hg/strip-backup/0c587ffcb480-0ea5695f-rebase.hg
$ hg qci -m 'save patch state' $ hg qci -m 'save patch state'
$ hg qseries -s $ hg qseries -s
f_git.patch: P0 (git) f_git.patch: P0 (git)
f.patch: P1 f.patch: P1
$ 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: not rebasing 1:0aaf4c3af7eb "important commit message" (empty-important qbase), its destination already has all its changes note: not rebasing 1:0aaf4c3af7eb empty-important qbase "important commit message", 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

Branch name containing a dash (issue3181) Branch name containing a dash (issue3181)
$ hg rebase -b dev-two -d dev-one --keepbranches $ hg rebase -b dev-two -d dev-one --keepbranches
rebasing 5:24b6387c8c8c "F" rebasing 5:24b6387c8c8c "F"
rebasing 6:eea13746799a "G" rebasing 6:eea13746799a "G"
rebasing 7:02de42196ebe "H" rebasing 7:02de42196ebe "H"
rebasing 9:cb039b7cae8e "dev-two named branch" (tip) rebasing 9:cb039b7cae8e tip "dev-two named branch"
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/24b6387c8c8c-24cb8001-rebase.hg saved backup bundle to $TESTTMP/a1/.hg/strip-backup/24b6387c8c8c-24cb8001-rebase.hg
$ hg tglog $ hg tglog
@ 9: 9e70cd31750f 'dev-two named branch' dev-two @ 9: 9e70cd31750f 'dev-two named branch' dev-two
| |
o 8: 31d0e4ba75e6 'H' o 8: 31d0e4ba75e6 'H'
| |
| o 7: 4b988a958030 'G' | o 7: 4b988a958030 'G'
|/ |/
o 0: cd010b8cd998 'A' o 0: cd010b8cd998 'A'
$ hg rebase -s dev-one -d 0 --keepbranches $ hg rebase -s dev-one -d 0 --keepbranches
rebasing 5:643fc9128048 "dev-one named branch" rebasing 5:643fc9128048 "dev-one named branch"
rebasing 6:24de4aff8e28 "F" rebasing 6:24de4aff8e28 "F"
rebasing 7:4b988a958030 "G" rebasing 7:4b988a958030 "G"
rebasing 8:31d0e4ba75e6 "H" rebasing 8:31d0e4ba75e6 "H"
rebasing 9:9e70cd31750f "dev-two named branch" (tip) rebasing 9:9e70cd31750f tip "dev-two named branch"
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-c4ee9ef5-rebase.hg saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-c4ee9ef5-rebase.hg
$ hg tglog $ hg tglog
@ 9: 59c2e59309fe 'dev-two named branch' dev-two @ 9: 59c2e59309fe 'dev-two named branch' dev-two
| |
o 8: 904590360559 'H' o 8: 904590360559 'H'
| |
| o 7: 1a1e6f72ec38 'G' | o 7: 1a1e6f72ec38 'G'
|/ |/
o 0: cd010b8cd998 'A' o 0: cd010b8cd998 'A'
$ hg rebase -s 'max(branch("dev-one"))' -d 0 --keepbranches $ hg rebase -s 'max(branch("dev-one"))' -d 0 --keepbranches
rebasing 5:643fc9128048 "dev-one named branch" rebasing 5:643fc9128048 "dev-one named branch"
rebasing 6:679f28760620 "F" rebasing 6:679f28760620 "F"
rebasing 7:549f007a9f5f "G" rebasing 7:549f007a9f5f "G"
rebasing 8:12b2bc666e20 "H" rebasing 8:12b2bc666e20 "H"
rebasing 9:71325f8bc082 "dev-two named branch" (tip) rebasing 9:71325f8bc082 tip "dev-two named branch"
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-6cdd1a52-rebase.hg saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-6cdd1a52-rebase.hg
$ hg tglog $ hg tglog
o 9: 3944801ae4ea 'dev-two named branch' dev-two o 9: 3944801ae4ea 'dev-two named branch' dev-two
| |
o 8: 8e279d293175 'H' o 8: 8e279d293175 'H'
| |
| o 7: aeefee77ab01 'G' | o 7: aeefee77ab01 'G'
$ hg rebase -s 5 -d 6 $ hg rebase -s 5 -d 6
abort: source and destination form a cycle abort: source and destination form a cycle
[255] [255]
$ hg rebase -s 6 -d 5 $ hg rebase -s 6 -d 5
rebasing 6:3944801ae4ea "dev-two named branch" rebasing 6:3944801ae4ea "dev-two named branch"
rebasing 7:3bdb949809d9 "B" rebasing 7:3bdb949809d9 "B"
rebasing 8:a0d543090fa4 "C" rebasing 8:a0d543090fa4 "C"
rebasing 9:e9f862ce8bad "D" (tip) rebasing 9:e9f862ce8bad tip "D"
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/3944801ae4ea-fb46ed74-rebase.hg saved backup bundle to $TESTTMP/a1/.hg/strip-backup/3944801ae4ea-fb46ed74-rebase.hg
$ hg tglog $ hg tglog
o 9: e522577ccdbd 'D' o 9: e522577ccdbd 'D'
| |
o 8: 810110211f50 'C' o 8: 810110211f50 'C'
| |
o 7: 160b0930ccc6 'B' o 7: 160b0930ccc6 'B'
-A -A
+A-mod +A-mod
--dry-run doesn't affect a dirty working directory that is unrelated to the --dry-run doesn't affect a dirty working directory that is unrelated to the
source or destination. source or destination.
$ hg rebase -s tip -d 4 --dry-run $ hg rebase -s tip -d 4 --dry-run
starting dry-run rebase; repository will not be changed starting dry-run rebase; repository will not be changed
rebasing 11:be1dea60f2a6 "D" (tip) rebasing 11:be1dea60f2a6 tip "D"
dry-run rebase completed successfully; run without -n/--dry-run to perform this rebase dry-run rebase completed successfully; run without -n/--dry-run to perform this rebase
$ hg diff $ hg diff
diff -r 2b586e70108d A diff -r 2b586e70108d A
--- a/A Thu Jan 01 00:00:00 1970 +0000 --- a/A Thu Jan 01 00:00:00 1970 +0000
+++ b/A Thu Jan 01 00:00:00 1970 +0000 +++ b/A Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,1 @@ @@ -1,1 +1,1 @@
-A -A
+A-mod +A-mod
Bailing out on --confirm doesn't affect a dirty working directory that is Bailing out on --confirm doesn't affect a dirty working directory that is
unrelated to the source or destination. unrelated to the source or destination.
$ echo A-mod > A $ echo A-mod > A
$ echo n | hg rebase -s tip -d 4 --confirm --config ui.interactive=True $ echo n | hg rebase -s tip -d 4 --confirm --config ui.interactive=True
starting in-memory rebase starting in-memory rebase
rebasing 11:be1dea60f2a6 "D" (tip) rebasing 11:be1dea60f2a6 tip "D"
rebase completed successfully rebase completed successfully
apply changes (yn)? n apply changes (yn)? n
$ hg diff $ hg diff
diff -r 2b586e70108d A diff -r 2b586e70108d A
--- a/A Thu Jan 01 00:00:00 1970 +0000 --- a/A Thu Jan 01 00:00:00 1970 +0000
+++ b/A Thu Jan 01 00:00:00 1970 +0000 +++ b/A Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,1 @@ @@ -1,1 +1,1 @@
-A -A
+A-mod +A-mod
$ echo A-mod > A $ echo A-mod > A
$ hg rebase -s tip -d 4 --confirm $ hg rebase -s tip -d 4 --confirm
starting in-memory rebase starting in-memory rebase
rebasing 11:be1dea60f2a6 "D" (tip) rebasing 11:be1dea60f2a6 tip "D"
rebase completed successfully rebase completed successfully
apply changes (yn)? y apply changes (yn)? y
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/be1dea60f2a6-ca6d2dac-rebase.hg saved backup bundle to $TESTTMP/a1/.hg/strip-backup/be1dea60f2a6-ca6d2dac-rebase.hg
$ hg diff $ hg diff
diff -r 2b586e70108d A diff -r 2b586e70108d A
--- a/A Thu Jan 01 00:00:00 1970 +0000 --- a/A Thu Jan 01 00:00:00 1970 +0000
+++ b/A Thu Jan 01 00:00:00 1970 +0000 +++ b/A Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,1 @@ @@ -1,1 +1,1 @@
$ 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 tip "c2 closed"
note: not rebasing 4:8427af5d86f2 "c2 closed" (tip), its destination already has all its changes note: not rebasing 4:8427af5d86f2 tip "c2 closed", 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

rebase of merge of ancestors rebase of merge of ancestors
$ hg up -qr 2 $ hg up -qr 2
$ hg merge -qr 3 $ hg merge -qr 3
$ echo 'other change while merging future "rebase ancestors"' > other $ echo 'other change while merging future "rebase ancestors"' > other
$ hg ci -Aqm 'merge rebase ancestors' $ hg ci -Aqm 'merge rebase ancestors'
$ hg rebase -d 5 -v $ hg rebase -d 5 -v
rebasing 6:4c5f12f25ebe "merge rebase ancestors" (tip) rebasing 6:4c5f12f25ebe tip "merge rebase ancestors"
resolving manifests resolving manifests
removing other removing other
resolving manifests resolving manifests
getting other getting other
committing files: committing files:
other other
committing manifest committing manifest
committing changelog committing changelog
> | | > | |
> B C > B C
> |/ > |/
> A Z > A Z
> |/ > |/
> R > R
> EOS > EOS
$ hg rebase -r D+E+F -d Z $ hg rebase -r D+E+F -d Z
rebasing 5:5f2c926dfecf "D" (D) rebasing 5:5f2c926dfecf D "D"
rebasing 6:b296604d9846 "E" (E) rebasing 6:b296604d9846 E "E"
rebasing 7:caa9781e507d "F" (F tip) rebasing 7:caa9781e507d F tip "F"
abort: rebasing 7:caa9781e507d will include unwanted changes from 4:d6003a550c2c or 3:c1e6b162678d abort: rebasing 7:caa9781e507d will include unwanted changes from 4:d6003a550c2c or 3:c1e6b162678d
[255] [255]
The warning does not get printed if there is no unwanted change detected: The warning does not get printed if there is no unwanted change detected:
$ hg init $TESTTMP/dual-merge-base2 $ hg init $TESTTMP/dual-merge-base2
$ cd $TESTTMP/dual-merge-base2 $ cd $TESTTMP/dual-merge-base2
$ hg debugdrawdag <<'EOS' $ hg debugdrawdag <<'EOS'
> D > D
> /| > /|
> B C > B C
> |/ > |/
> A Z > A Z
> |/ > |/
> R > R
> EOS > EOS
$ hg rebase -r B+C+D -d Z $ hg rebase -r B+C+D -d Z
rebasing 3:c1e6b162678d "B" (B) rebasing 3:c1e6b162678d B "B"
rebasing 4:d6003a550c2c "C" (C) rebasing 4:d6003a550c2c C "C"
rebasing 5:c8f78076273e "D" (D tip) rebasing 5:c8f78076273e D tip "D"
saved backup bundle to $TESTTMP/dual-merge-base2/.hg/strip-backup/d6003a550c2c-6f1424b6-rebase.hg saved backup bundle to $TESTTMP/dual-merge-base2/.hg/strip-backup/d6003a550c2c-6f1424b6-rebase.hg
$ hg manifest -r 'desc(D)' $ hg manifest -r 'desc(D)'
B B
C C
R R
Z Z
The merge base could be different from old p1 (changed parent becomes new p1): The merge base could be different from old p1 (changed parent becomes new p1):
$ hg init $TESTTMP/chosen-merge-base1 $ hg init $TESTTMP/chosen-merge-base1
$ cd $TESTTMP/chosen-merge-base1 $ cd $TESTTMP/chosen-merge-base1
$ hg debugdrawdag <<'EOS' $ hg debugdrawdag <<'EOS'
> F > F
> /| > /|
> D E > D E
> | | > | |
> B C Z > B C Z
> EOS > EOS
$ hg rebase -r D+F -d Z $ hg rebase -r D+F -d Z
rebasing 3:004dc1679908 "D" (D) rebasing 3:004dc1679908 D "D"
rebasing 5:4be4cbf6f206 "F" (F tip) rebasing 5:4be4cbf6f206 F tip "F"
saved backup bundle to $TESTTMP/chosen-merge-base1/.hg/strip-backup/004dc1679908-06a66a3c-rebase.hg saved backup bundle to $TESTTMP/chosen-merge-base1/.hg/strip-backup/004dc1679908-06a66a3c-rebase.hg
$ hg manifest -r 'desc(F)' $ hg manifest -r 'desc(F)'
C C
D D
E E
Z Z
$ hg log -r `hg log -r 'desc(F)' -T '{p1node}'` -T '{desc}\n' $ hg log -r `hg log -r 'desc(F)' -T '{p1node}'` -T '{desc}\n'
D D
$ hg init $TESTTMP/chosen-merge-base2 $ hg init $TESTTMP/chosen-merge-base2
$ cd $TESTTMP/chosen-merge-base2 $ cd $TESTTMP/chosen-merge-base2
$ hg debugdrawdag <<'EOS' $ hg debugdrawdag <<'EOS'
> F > F
> /| > /|
> D E > D E
> | | > | |
> B C Z > B C Z
> EOS > EOS
$ hg rebase -r E+F -d Z $ hg rebase -r E+F -d Z
rebasing 4:974e4943c210 "E" (E) rebasing 4:974e4943c210 E "E"
rebasing 5:4be4cbf6f206 "F" (F tip) rebasing 5:4be4cbf6f206 F tip "F"
saved backup bundle to $TESTTMP/chosen-merge-base2/.hg/strip-backup/974e4943c210-b2874da5-rebase.hg saved backup bundle to $TESTTMP/chosen-merge-base2/.hg/strip-backup/974e4943c210-b2874da5-rebase.hg
$ hg manifest -r 'desc(F)' $ hg manifest -r 'desc(F)'
B B
D D
E E
Z Z
$ hg log -r `hg log -r 'desc(F)' -T '{p1node}'` -T '{desc}\n' $ hg log -r `hg log -r 'desc(F)' -T '{p1node}'` -T '{desc}\n'
E E

tests/test-rebase-obsolete.t

o | 5:24b6387c8c8c F o | 5:24b6387c8c8c F
| | | |
| o 4:9520eea781bc E | o 4:9520eea781bc E
|/ |/
o 0:cd010b8cd998 A o 0:cd010b8cd998 A
$ hg rebase --source 'desc(B)' --dest 'tip' --config experimental.rebaseskipobsolete=True $ hg rebase --source 'desc(B)' --dest 'tip' --config experimental.rebaseskipobsolete=True
rebasing 8:8877864f1edb "B" rebasing 8:8877864f1edb "B"
note: not rebasing 9:08483444fef9 "D", already in destination as 11:4596109a6a43 "D" (tip) note: not rebasing 9:08483444fef9 "D", already in destination as 11:4596109a6a43 tip "D"
rebasing 10:5ae4c968c6ac "C" rebasing 10:5ae4c968c6ac "C"
$ hg debugobsolete $ hg debugobsolete
42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'rebase', 'user': 'test'} 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'rebase', 'user': 'test'}
5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
32af7686d403cf45b5d95f2d70cebea587ac806a 0 {5fddd98957c8a54a4d436dfe1da9d87f21a1b97b} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'rebase', 'user': 'test'} 32af7686d403cf45b5d95f2d70cebea587ac806a 0 {5fddd98957c8a54a4d436dfe1da9d87f21a1b97b} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'rebase', 'user': 'test'}
08483444fef91d6224f6655ee586a65d263ad34c 4596109a6a4328c398bde3a4a3b6737cfade3003 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} 08483444fef91d6224f6655ee586a65d263ad34c 4596109a6a4328c398bde3a4a3b6737cfade3003 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
8877864f1edb05d0e07dc4ba77b67a80a7b86672 462a34d07e599b87ea08676a449373fe4e2e1347 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} 8877864f1edb05d0e07dc4ba77b67a80a7b86672 462a34d07e599b87ea08676a449373fe4e2e1347 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
5ae4c968c6aca831df823664e706c9d4aa34473d 98f6af4ee9539e14da4465128f894c274900b6e5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} 5ae4c968c6aca831df823664e706c9d4aa34473d 98f6af4ee9539e14da4465128f894c274900b6e5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
D D
$ hg up -qr 'desc(G)' $ hg up -qr 'desc(G)'
$ hg graft 4596109a6a4328c398bde3a4a3b6737cfade3003 $ hg graft 4596109a6a4328c398bde3a4a3b6737cfade3003
grafting 11:4596109a6a43 "D" grafting 11:4596109a6a43 "D"
$ hg up -qr 'desc(E)' $ hg up -qr 'desc(E)'
$ hg rebase -s tip -d . $ hg rebase -s tip -d .
rebasing 14:9e36056a46e3 "D" (tip) rebasing 14:9e36056a46e3 tip "D"
$ hg log --style default --debug -r tip $ hg log --style default --debug -r tip
changeset: 15:627d4614809036ba22b9e7cb31638ddc06ab99ab changeset: 15:627d4614809036ba22b9e7cb31638ddc06ab99ab
tag: tip tag: tip
phase: draft phase: draft
parent: 4:9520eea781bcca16c1e15acc0ba14335a0e8e5ba parent: 4:9520eea781bcca16c1e15acc0ba14335a0e8e5ba
parent: -1:0000000000000000000000000000000000000000 parent: -1:0000000000000000000000000000000000000000
manifest: 15:648e8ede73ae3e497d093d3a4c8fcc2daa864f42 manifest: 15:648e8ede73ae3e497d093d3a4c8fcc2daa864f42
user: Nicolas Dumazet <nicdumz.commits@gmail.com> user: Nicolas Dumazet <nicdumz.commits@gmail.com>
$ rm -r ../stabilize $ rm -r ../stabilize
Test multiple root handling Test multiple root handling
------------------------------------ ------------------------------------
$ hg rebase --dest 4 --rev '7+11+9' $ hg rebase --dest 4 --rev '7+11+9'
rebasing 9:cf44d2f5a9f4 "D" rebasing 9:cf44d2f5a9f4 "D"
rebasing 7:02de42196ebe "H" rebasing 7:02de42196ebe "H"
rebasing 11:0d8f238b634c "C" (tip) rebasing 11:0d8f238b634c tip "C"
$ hg log -G $ hg log -G
o 14:1e8370e38cca C o 14:1e8370e38cca C
| |
@ 13:bfe264faf697 H @ 13:bfe264faf697 H
| |
| o 12:102b4c1d889b D | o 12:102b4c1d889b D
|/ |/
| * 10:7c6027df6a99 B | * 10:7c6027df6a99 B
> C E > C E
> | | > | |
> B D G > B D G
> \|/ > \|/
> A > A
> EOF > EOF
$ hg rebase -d G -r 'B + D + F' $ hg rebase -d G -r 'B + D + F'
rebasing 1:112478962961 "B" (B) rebasing 1:112478962961 B "B"
rebasing 2:b18e25de2cf5 "D" (D) rebasing 2:b18e25de2cf5 D "D"
rebasing 6:f15c3adaf214 "F" (F tip) rebasing 6:f15c3adaf214 F tip "F"
abort: cannot rebase 6:f15c3adaf214 without moving at least one of its parents abort: cannot rebase 6:f15c3adaf214 without moving at least one of its parents
[255] [255]
$ cd .. $ cd ..
test on rebase dropping a merge test on rebase dropping a merge
(setup) (setup)
|/ |/
o 0:cd010b8cd998 A o 0:cd010b8cd998 A
(actual test) (actual test)
$ hg rebase --dest 6 --rev '((desc(H) + desc(D))::) - desc(M)' $ hg rebase --dest 6 --rev '((desc(H) + desc(D))::) - desc(M)'
rebasing 3:32af7686d403 "D" rebasing 3:32af7686d403 "D"
rebasing 7:02de42196ebe "H" rebasing 7:02de42196ebe "H"
rebasing 9:4bde274eefcf "I" (tip) rebasing 9:4bde274eefcf tip "I"
1 new orphan changesets 1 new orphan changesets
$ hg log -G $ hg log -G
@ 12:acd174b7ab39 I @ 12:acd174b7ab39 I
| |
o 11:6c11a6218c97 H o 11:6c11a6218c97 H
| |
| o 10:b5313c85b22e D | o 10:b5313c85b22e D
|/ |/
$ hg commit -m J $ hg commit -m J
1 new orphan changesets 1 new orphan changesets
$ hg debugobsolete `hg log --rev . -T '{node}'` $ hg debugobsolete `hg log --rev . -T '{node}'`
1 new obsolescence markers 1 new obsolescence markers
obsoleted 1 changesets obsoleted 1 changesets
$ hg rebase --rev .~1::. --dest 'max(desc(D))' --traceback --config experimental.rebaseskipobsolete=off $ hg rebase --rev .~1::. --dest 'max(desc(D))' --traceback --config experimental.rebaseskipobsolete=off
rebasing 9:4bde274eefcf "I" rebasing 9:4bde274eefcf "I"
rebasing 13:06edfc82198f "J" (tip) rebasing 13:06edfc82198f tip "J"
2 new content-divergent changesets 2 new content-divergent changesets
$ hg log -G $ hg log -G
@ 15:5ae8a643467b J @ 15:5ae8a643467b J
| |
* 14:9ad579b4a5de I * 14:9ad579b4a5de I
| |
| * 12:acd174b7ab39 I | * 12:acd174b7ab39 I
| | | |
|/ |/
o 0:4a2df7238c3b A o 0:4a2df7238c3b A
Rebase finds its way in a chain of marker Rebase finds its way in a chain of marker
$ hg rebase -d 'desc(B2)' $ hg rebase -d 'desc(B2)'
note: not rebasing 1:a8b11f55fb19 "B0", already in destination as 3:261e70097290 "B2" note: not rebasing 1:a8b11f55fb19 "B0", already in destination as 3:261e70097290 "B2"
rebasing 4:212cb178bcbb "C" (tip) rebasing 4:212cb178bcbb tip "C"
Even when the chain include missing node Even when the chain include missing node
$ hg up --hidden 'desc(B0)' $ hg up --hidden 'desc(B0)'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
updated to hidden changeset a8b11f55fb19 updated to hidden changeset a8b11f55fb19
(hidden revision 'a8b11f55fb19' was rewritten as: 261e70097290) (hidden revision 'a8b11f55fb19' was rewritten as: 261e70097290)
$ echo D > D $ echo D > D
| | | |
x | 1:a8b11f55fb19 B0 (rewritten using amend as 2:261e70097290) x | 1:a8b11f55fb19 B0 (rewritten using amend as 2:261e70097290)
|/ |/
o 0:4a2df7238c3b A o 0:4a2df7238c3b A
$ hg rebase -d 'desc(B2)' $ hg rebase -d 'desc(B2)'
note: not rebasing 1:a8b11f55fb19 "B0", already in destination as 2:261e70097290 "B2" note: not rebasing 1:a8b11f55fb19 "B0", already in destination as 2:261e70097290 "B2"
rebasing 5:1a79b7535141 "D" (tip) rebasing 5:1a79b7535141 tip "D"
$ hg up 4 $ hg up 4
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo "O" > O $ echo "O" > O
$ hg add O $ hg add O
$ hg commit -m O $ hg commit -m O
$ echo "P" > P $ echo "P" > P
$ hg add P $ hg add P
$ hg commit -m P $ hg commit -m P
$ hg debugobsolete `hg log -r 7 -T '{node}\n'` --config experimental.evolution=true $ hg debugobsolete `hg log -r 7 -T '{node}\n'` --config experimental.evolution=true
1 new obsolescence markers 1 new obsolescence markers
obsoleted 1 changesets obsoleted 1 changesets
1 new orphan changesets 1 new orphan changesets
$ hg rebase -d 6 -r "4::" $ hg rebase -d 6 -r "4::"
rebasing 4:ff2c4d47b71d "C" rebasing 4:ff2c4d47b71d "C"
note: not rebasing 7:360bbaa7d3ce "O", it has no successor note: not rebasing 7:360bbaa7d3ce "O", it has no successor
rebasing 8:8d47583e023f "P" (tip) rebasing 8:8d47583e023f tip "P"
If all the changeset to be rebased are obsolete and present in the destination, we If all the changeset to be rebased are obsolete and present in the destination, we
should display a friendly error message should display a friendly error message
$ hg log -G $ hg log -G
@ 10:121d9e3bc4c6 P @ 10:121d9e3bc4c6 P
| |
o 9:4be60e099a77 C o 9:4be60e099a77 C
| |
o 6:9c48361117de D o 6:9c48361117de D
| |
o 2:261e70097290 B2 o 2:261e70097290 B2
| |
o 0:4a2df7238c3b A o 0:4a2df7238c3b A
$ hg rebase -r . -d 10 $ hg rebase -r . -d 10
note: not rebasing 11:f44da1f4954c "nonrelevant" (tip), it has no successor note: not rebasing 11:f44da1f4954c tip "nonrelevant", it has no successor
If a rebase is going to create divergence, it should abort If a rebase is going to create divergence, it should abort
$ hg log -G $ hg log -G
@ 10:121d9e3bc4c6 P @ 10:121d9e3bc4c6 P
| |
o 9:4be60e099a77 C o 9:4be60e099a77 C
| |
o 2:261e70097290 B2 o 2:261e70097290 B2
| |
o 0:4a2df7238c3b A o 0:4a2df7238c3b A
With experimental.evolution.allowdivergence=True, rebase can create divergence With experimental.evolution.allowdivergence=True, rebase can create divergence
$ hg rebase -s 10 -d 12 --config experimental.evolution.allowdivergence=True $ hg rebase -s 10 -d 12 --config experimental.evolution.allowdivergence=True
rebasing 10:121d9e3bc4c6 "P" rebasing 10:121d9e3bc4c6 "P"
rebasing 14:73568ab6879d "bar foo" (tip) rebasing 14:73568ab6879d tip "bar foo"
2 new content-divergent changesets 2 new content-divergent changesets
$ hg summary $ hg summary
parent: 16:61bd55f69bc4 tip parent: 16:61bd55f69bc4 tip
bar foo bar foo
branch: default branch: default
commit: (clean) commit: (clean)
update: 1 new changesets, 2 branch heads (merge) update: 1 new changesets, 2 branch heads (merge)
phases: 8 draft phases: 8 draft
[1] [1]
$ hg resolve --mark willconflict $ hg resolve --mark willconflict
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase --continue $ hg rebase --continue
rebasing 19:b82fb57ea638 "willconflict second version" rebasing 19:b82fb57ea638 "willconflict second version"
note: not rebasing 20:8b31da3c4919 "dummy change", already in destination as 18:601db7a18f51 "dummy change successor" note: not rebasing 20:8b31da3c4919 "dummy change", already in destination as 18:601db7a18f51 "dummy change successor"
rebasing 21:7bdc8a87673d "dummy change" (tip) rebasing 21:7bdc8a87673d tip "dummy change"
$ cd .. $ cd ..
Divergence cases due to obsolete changesets Divergence cases due to obsolete changesets
------------------------------------------- -------------------------------------------
We should ignore branches with unstable changesets when they are based on an We should ignore branches with unstable changesets when they are based on an
obsolete changeset which successor is in rebase set. obsolete changeset which successor is in rebase set.
o 0:b173517d0057 a o 0:b173517d0057 a
Changeset d and its descendants are excluded to avoid divergence of d, which Changeset d and its descendants are excluded to avoid divergence of d, which
would occur because the successor of d (d') is also in rebaseset. As a would occur because the successor of d (d') is also in rebaseset. As a
consequence f (descendant of d) is left behind. consequence f (descendant of d) is left behind.
$ hg rebase -b 'e' -d 'x' $ hg rebase -b 'e' -d 'x'
rebasing 1:488e1b7e7341 "b" (b) rebasing 1:488e1b7e7341 b "b"
rebasing 3:a82ac2b38757 "c" (c) rebasing 3:a82ac2b38757 c "c"
rebasing 5:027ad6c5830d "d'" (d') rebasing 5:027ad6c5830d d' "d'"
rebasing 6:d60ebfa0f1cb "e" (e) rebasing 6:d60ebfa0f1cb e "e"
note: not rebasing 4:76be324c128b "d" (d) and its descendants as this would cause divergence note: not rebasing 4:76be324c128b d "d" and its descendants as this would cause divergence
$ hg log -G -r 'a':: $ hg log -G -r 'a'::
o 11:eb6d63fc4ed5 e o 11:eb6d63fc4ed5 e
| |
o 10:44d8c724a70c d' o 10:44d8c724a70c d'
| |
o 9:d008e6b4d3fd c o 9:d008e6b4d3fd c
| |
o 8:67e8f4a16c49 b o 8:67e8f4a16c49 b
set and none in destination, we still get the divergence warning. set and none in destination, we still get the divergence warning.
By allowing divergence, we can perform the rebase. By allowing divergence, we can perform the rebase.
$ hg rebase -r 'c'::'f' -d 'x' $ hg rebase -r 'c'::'f' -d 'x'
abort: this rebase will cause divergences from: 76be324c128b abort: this rebase will cause divergences from: 76be324c128b
(to force the rebase please set experimental.evolution.allowdivergence=True) (to force the rebase please set experimental.evolution.allowdivergence=True)
[255] [255]
$ hg rebase --config experimental.evolution.allowdivergence=true -r 'c'::'f' -d 'x' $ hg rebase --config experimental.evolution.allowdivergence=true -r 'c'::'f' -d 'x'
rebasing 3:a82ac2b38757 "c" (c) rebasing 3:a82ac2b38757 c "c"
rebasing 4:76be324c128b "d" (d) rebasing 4:76be324c128b d "d"
rebasing 7:1143e9adc121 "f" (f tip) rebasing 7:1143e9adc121 f tip "f"
1 new orphan changesets 1 new orphan changesets
2 new content-divergent changesets 2 new content-divergent changesets
$ hg log -G -r 'a':: -T instabilities $ hg log -G -r 'a':: -T instabilities
o 10:e1744ea07510 f o 10:e1744ea07510 f
| |
* 9:e2b36ea9a0a0 d (content-divergent) * 9:e2b36ea9a0a0 d (content-divergent)
| |
o 8:6a0376de376e c o 8:6a0376de376e c
|/ |/
o 0:b173517d0057 a o 0:b173517d0057 a
$ hg strip -r 8: $ hg strip -r 8:
(Not skipping obsoletes means that divergence is allowed.) (Not skipping obsoletes means that divergence is allowed.)
$ hg rebase --config experimental.rebaseskipobsolete=false -r 'c'::'f' -d 'x' $ hg rebase --config experimental.rebaseskipobsolete=false -r 'c'::'f' -d 'x'
rebasing 3:a82ac2b38757 "c" (c) rebasing 3:a82ac2b38757 c "c"
rebasing 4:76be324c128b "d" (d) rebasing 4:76be324c128b d "d"
rebasing 7:1143e9adc121 "f" (f tip) rebasing 7:1143e9adc121 f tip "f"
1 new orphan changesets 1 new orphan changesets
2 new content-divergent changesets 2 new content-divergent changesets
$ hg strip -r 0: $ hg strip -r 0:
Similar test on a more complex graph Similar test on a more complex graph
$ hg debugdrawdag <<EOF $ hg debugdrawdag <<EOF
| |
| o 2:630d7c95eff7 x | o 2:630d7c95eff7 x
| | | |
o | 1:488e1b7e7341 b o | 1:488e1b7e7341 b
|/ |/
o 0:b173517d0057 a o 0:b173517d0057 a
$ hg rebase -b 'f' -d 'x' $ hg rebase -b 'f' -d 'x'
rebasing 1:488e1b7e7341 "b" (b) rebasing 1:488e1b7e7341 b "b"
rebasing 3:a82ac2b38757 "c" (c) rebasing 3:a82ac2b38757 c "c"
rebasing 5:63324dc512ea "e'" (e') rebasing 5:63324dc512ea e' "e'"
rebasing 7:3ffec603ab53 "f" (f) rebasing 7:3ffec603ab53 f "f"
rebasing 4:76be324c128b "d" (d) rebasing 4:76be324c128b d "d"
note: not rebasing 6:e36fae928aec "e" (e) and its descendants as this would cause divergence note: not rebasing 6:e36fae928aec e "e" and its descendants as this would cause divergence
$ hg log -G -r 'a': $ hg log -G -r 'a':
o 13:a1707a5b7c2c d o 13:a1707a5b7c2c d
| |
| o 12:ef6251596616 f | o 12:ef6251596616 f
| | | |
| o 11:b6f172e64af9 e' | o 11:b6f172e64af9 e'
|/ |/
o 10:d008e6b4d3fd c o 10:d008e6b4d3fd c
| | | |
x | 2:a82ac2b38757 c (rewritten using replace as 3:ef8a456de8fa) x | 2:a82ac2b38757 c (rewritten using replace as 3:ef8a456de8fa)
|/ |/
o 1:488e1b7e7341 b o 1:488e1b7e7341 b
| |
o 0:b173517d0057 a o 0:b173517d0057 a
$ hg rebase -d 0 -r 2 $ hg rebase -d 0 -r 2
rebasing 2:a82ac2b38757 "c" (c) rebasing 2:a82ac2b38757 c "c"
$ hg log -G -r 'a': --hidden $ hg log -G -r 'a': --hidden
o 5:69ad416a4a26 c o 5:69ad416a4a26 c
| |
| * 4:76be324c128b d | * 4:76be324c128b d
| | | |
| | x 3:ef8a456de8fa c1 (pruned) | | x 3:ef8a456de8fa c1 (pruned)
| | | | | |
| x | 2:a82ac2b38757 c (rewritten using replace as 3:ef8a456de8fa rewritten using rebase as 5:69ad416a4a26) | x | 2:a82ac2b38757 c (rewritten using replace as 3:ef8a456de8fa rewritten using rebase as 5:69ad416a4a26)
> /| > /|
> E D B # replace: D -> B > E D B # replace: D -> B
> \|/ > \|/
> A > A
> EOF > EOF
1 new orphan changesets 1 new orphan changesets
$ hg rebase -d B -s D $ hg rebase -d B -s D
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 4:66f1a38021c9 "F" (F tip) rebasing 4:66f1a38021c9 F tip "F"
$ hg log -G $ hg log -G
o 5:50e9d60b99c6 F o 5:50e9d60b99c6 F
|\ |\
| | x 4:66f1a38021c9 F (rewritten using rebase as 5:50e9d60b99c6) | | x 4:66f1a38021c9 F (rewritten using rebase as 5:50e9d60b99c6)
| |/| | |/|
| o | 3:7fb047a69f22 E | o | 3:7fb047a69f22 E
| | | | | |
| | x 2:b18e25de2cf5 D (rewritten using replace as 1:112478962961) | | x 2:b18e25de2cf5 D (rewritten using replace as 1:112478962961)
> /| > /|
> E D B # replace: E -> B > E D B # replace: E -> B
> \|/ > \|/
> A > A
> EOF > EOF
1 new orphan changesets 1 new orphan changesets
$ hg rebase -d B -s E $ hg rebase -d B -s E
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 4:66f1a38021c9 "F" (F tip) rebasing 4:66f1a38021c9 F tip "F"
$ hg log -G $ hg log -G
o 5:aae1787dacee F o 5:aae1787dacee F
|\ |\
| | x 4:66f1a38021c9 F (rewritten using rebase as 5:aae1787dacee) | | x 4:66f1a38021c9 F (rewritten using rebase as 5:aae1787dacee)
| |/| | |/|
| | x 3:7fb047a69f22 E (rewritten using replace as 1:112478962961) | | x 3:7fb047a69f22 E (rewritten using replace as 1:112478962961)
| | | | | |
| o | 2:b18e25de2cf5 D | o | 2:b18e25de2cf5 D
> /| | > /| |
> E D B # replace: D -> B > E D B # replace: D -> B
> \|/ > \|/
> A > A
> EOF > EOF
1 new orphan changesets 1 new orphan changesets
$ hg rebase -d C -s D $ hg rebase -d C -s D
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 5:66f1a38021c9 "F" (F tip) rebasing 5:66f1a38021c9 F tip "F"
$ hg log -G $ hg log -G
o 6:0913febf6439 F o 6:0913febf6439 F
|\ |\
+---x 5:66f1a38021c9 F (rewritten using rebase as 6:0913febf6439) +---x 5:66f1a38021c9 F (rewritten using rebase as 6:0913febf6439)
| | | | | |
| o | 4:26805aba1e60 C | o | 4:26805aba1e60 C
| | | | | |
> /| | > /| |
> E D B # replace: E -> B > E D B # replace: E -> B
> \|/ > \|/
> A > A
> EOF > EOF
1 new orphan changesets 1 new orphan changesets
$ hg rebase -d C -s E $ hg rebase -d C -s E
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 tip "F"
$ hg log -G $ hg log -G
o 6:c6ab0cc6d220 F o 6:c6ab0cc6d220 F
|\ |\
+---x 5:66f1a38021c9 F (rewritten using rebase as 6:c6ab0cc6d220) +---x 5:66f1a38021c9 F (rewritten using rebase as 6:c6ab0cc6d220)
| | | | | |
| 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)
> /| | > /| |
> E D B # replace: E -> B > E D B # replace: E -> B
> \|/ > \|/
> 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 tip "F"
note: not rebasing 5:66f1a38021c9 "F" (F tip), its destination already has all its changes note: not rebasing 5:66f1a38021c9 F tip "F", 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)
> /| | > /| |
> E D B # replace: D -> B > E D B # replace: D -> B
> \|/ > \|/
> 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 tip "F"
note: not rebasing 5:66f1a38021c9 "F" (F tip), its destination already has all its changes note: not rebasing 5:66f1a38021c9 F tip "F", 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
| | | | | |
> E C # replace: C -> E > E C # replace: C -> E
> | | > | |
> D B > D B
> |/ > |/
> A > A
> EOF > EOF
$ hg rebase -d D -s B $ hg rebase -d D -s B
rebasing 1:112478962961 "B" (B) rebasing 1:112478962961 B "B"
note: not rebasing 3:26805aba1e60 "C" (C) and its descendants as this would cause divergence note: not rebasing 3:26805aba1e60 C "C" and its descendants as this would cause divergence
$ cd .. $ cd ..
$ hg init p2-succ-in-dest-c $ hg init p2-succ-in-dest-c
$ cd p2-succ-in-dest-c $ cd p2-succ-in-dest-c
The scenario here was that B::D were developed on default. B was queued on The scenario here was that B::D were developed on default. B was queued on
stable, but amended before being push to hg-committed. C was queued on default, stable, but amended before being push to hg-committed. C was queued on default,
> E F > E F
> /| /| # replace: A -> C > /| /| # replace: A -> C
> A B C D # replace: B -> D > A B C D # replace: B -> D
> | | > | |
> X Y > X Y
> EOS > EOS
1 new orphan changesets 1 new orphan changesets
$ hg rebase -r A+B+E -d F $ hg rebase -r A+B+E -d F
note: not rebasing 4:a3d17304151f "A" (A), already in destination as 0:96cc3511f894 "C" (C) note: not rebasing 4:a3d17304151f A "A", already in destination as 0:96cc3511f894 C "C"
note: not rebasing 5:b23a2cc00842 "B" (B), already in destination as 1:058c1e1fb10a "D" (D) note: not rebasing 5:b23a2cc00842 B "B", already in destination as 1:058c1e1fb10a D "D"
rebasing 7:dac5d11c5a7d "E" (E tip) rebasing 7:dac5d11c5a7d E tip "E"
abort: rebasing 7:dac5d11c5a7d will include unwanted changes from 3:59c792af609c, 5:b23a2cc00842 or 2:ba2b7fa7166d, 4:a3d17304151f abort: rebasing 7:dac5d11c5a7d will include unwanted changes from 3:59c792af609c, 5:b23a2cc00842 or 2:ba2b7fa7166d, 4:a3d17304151f
[255] [255]
$ cd .. $ cd ..
Rebase a non-clean merge. One parent has successor in destination, the other Rebase a non-clean merge. One parent has successor in destination, the other
parent moves as requested. parent moves as requested.
$ hg init p1-succ-p2-move $ hg init p1-succ-p2-move
$ cd p1-succ-p2-move $ cd p1-succ-p2-move
$ hg debugdrawdag <<'EOS' $ hg debugdrawdag <<'EOS'
> D Z > D Z
> /| | # replace: A -> C > /| | # replace: A -> C
> A B C # D/D = D > A B C # D/D = D
> EOS > EOS
1 new orphan changesets 1 new orphan changesets
$ hg rebase -r A+B+D -d Z $ hg rebase -r A+B+D -d Z
note: not rebasing 0:426bada5c675 "A" (A), already in destination as 2:96cc3511f894 "C" (C) note: not rebasing 0:426bada5c675 A "A", already in destination as 2:96cc3511f894 C "C"
rebasing 1:fc2b737bb2e5 "B" (B) rebasing 1:fc2b737bb2e5 B "B"
rebasing 3:b8ed089c80ad "D" (D) rebasing 3:b8ed089c80ad D "D"
$ rm .hg/localtags $ rm .hg/localtags
$ hg log -G $ hg log -G
o 6:e4f78693cc88 D o 6:e4f78693cc88 D
| |
o 5:76840d832e98 B o 5:76840d832e98 B
| |
o 4:50e41c1f3950 Z o 4:50e41c1f3950 Z
$ cd p1-move-p2-succ $ cd p1-move-p2-succ
$ hg debugdrawdag <<'EOS' $ hg debugdrawdag <<'EOS'
> D Z > D Z
> /| | # replace: B -> C > /| | # replace: B -> C
> A B C # D/D = D > A B C # D/D = D
> EOS > EOS
1 new orphan changesets 1 new orphan changesets
$ hg rebase -r B+A+D -d Z $ hg rebase -r B+A+D -d Z
rebasing 0:426bada5c675 "A" (A) rebasing 0:426bada5c675 A "A"
note: not rebasing 1:fc2b737bb2e5 "B" (B), already in destination as 2:96cc3511f894 "C" (C) note: not rebasing 1:fc2b737bb2e5 B "B", already in destination as 2:96cc3511f894 C "C"
rebasing 3:b8ed089c80ad "D" (D) rebasing 3:b8ed089c80ad D "D"
$ rm .hg/localtags $ rm .hg/localtags
$ hg log -G $ hg log -G
o 6:1b355ed94d82 D o 6:1b355ed94d82 D
| |
o 5:a81a74d764a6 A o 5:a81a74d764a6 A
| |
o 4:50e41c1f3950 Z o 4:50e41c1f3950 Z
$ echo a > a && hg ci -Am a $ echo a > a && hg ci -Am a
adding a adding a
$ hg up 0 $ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo b > b && hg ci -Am b $ echo b > b && hg ci -Am b
adding b adding b
created new head created new head
$ hg rebase -r 2 -d 1 $ hg rebase -r 2 -d 1
rebasing 2:1e9a3c00cbe9 "b" (tip) rebasing 2:1e9a3c00cbe9 tip "b"
$ hg log -r . # working dir is at rev 3 (successor of 2) $ hg log -r . # working dir is at rev 3 (successor of 2)
3:be1832deae9a b (no-eol) 3:be1832deae9a b (no-eol)
$ hg book -r 2 mybook --hidden # rev 2 has a bookmark on it now $ hg book -r 2 mybook --hidden # rev 2 has a bookmark on it now
bookmarking hidden changeset 1e9a3c00cbe9 bookmarking hidden changeset 1e9a3c00cbe9
(hidden revision '1e9a3c00cbe9' was rewritten as: be1832deae9a) (hidden revision '1e9a3c00cbe9' was rewritten as: be1832deae9a)
$ hg up 2 && hg log -r . # working dir is at rev 2 again $ hg up 2 && hg log -r . # working dir is at rev 2 again
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
2:1e9a3c00cbe9 b (rewritten using rebase as 3:be1832deae9a) (no-eol) 2:1e9a3c00cbe9 b (rewritten using rebase as 3:be1832deae9a) (no-eol)
$ hg rebase -r 2 -d 3 --config experimental.evolution.track-operation=1 $ hg rebase -r 2 -d 3 --config experimental.evolution.track-operation=1
note: not rebasing 2:1e9a3c00cbe9 "b" (mybook), already in destination as 3:be1832deae9a "b" (tip) note: not rebasing 2:1e9a3c00cbe9 mybook "b", already in destination as 3:be1832deae9a tip "b"
Check that working directory and bookmark was updated to rev 3 although rev 2 Check that working directory and bookmark was updated to rev 3 although rev 2
was skipped was skipped
$ hg log -r . $ hg log -r .
3:be1832deae9a b (no-eol) 3:be1832deae9a b (no-eol)
$ hg bookmarks $ hg bookmarks
mybook 3:be1832deae9a mybook 3:be1832deae9a
$ hg debugobsolete --rev tip $ hg debugobsolete --rev tip
1e9a3c00cbe90d236ac05ef61efcc5e40b7412bc be1832deae9ac531caa7438b8dcf6055a122cd8e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} 1e9a3c00cbe90d236ac05ef61efcc5e40b7412bc be1832deae9ac531caa7438b8dcf6055a122cd8e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
> D2 | > D2 |
> | B > | B
> |/ > |/
> A > A
> EOS > EOS
$ hg update D1 -q $ hg update D1 -q
$ hg bookmark book -i $ hg bookmark book -i
$ hg rebase -r B+D1 -d E $ hg rebase -r B+D1 -d E
rebasing 1:112478962961 "B" (B) rebasing 1:112478962961 B "B"
note: not rebasing 5:15ecf15e0114 "D1" (book D1 tip), already in destination as 2:0807738e0be9 "D2" (D2) note: not rebasing 5:15ecf15e0114 D1 tip book "D1", already in destination as 2:0807738e0be9 D2 "D2"
1 new orphan changesets 1 new orphan changesets
$ hg log -G -T '{desc} {bookmarks}' $ hg log -G -T '{desc} {bookmarks}'
@ B book @ B book
| |
| x D1 | x D1
| | | |
o | E o | E
| | | |
Also test --continue for the above case Also test --continue for the above case
$ cd $TESTTMP/hidden-state2 $ cd $TESTTMP/hidden-state2
$ hg resolve -m $ hg resolve -m
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase --continue $ hg rebase --continue
rebasing 1:2ec65233581b "B" rebasing 1:2ec65233581b "B"
rebasing 3:7829726be4dc "C" (tip) rebasing 3:7829726be4dc tip "C"
$ hg log -G $ hg log -G
@ 5:1964d5d5b547 C @ 5:1964d5d5b547 C
| |
o 4:68deb90c12a2 B o 4:68deb90c12a2 B
| |
o 2:b18e25de2cf5 D o 2:b18e25de2cf5 D
| |
o 0:426bada5c675 A o 0:426bada5c675 A
| | | |
| o 2: 49cb3485fa0c 'C' bookmarks: Y | o 2: 49cb3485fa0c 'C' bookmarks: Y
| | | |
| o 1: 6c81ed0049f8 'B' bookmarks: X | o 1: 6c81ed0049f8 'B' bookmarks: X
|/ |/
o 0: 1994f17a630e 'A' bookmarks: o 0: 1994f17a630e 'A' bookmarks:
$ hg rebase -s 1 -d 5 $ hg rebase -s 1 -d 5
rebasing 1:6c81ed0049f8 "B" (X) rebasing 1:6c81ed0049f8 X "B"
rebasing 2:49cb3485fa0c "C" (Y) rebasing 2:49cb3485fa0c Y "C"
rebasing 3:67a385d4e6f2 "D" (Z) rebasing 3:67a385d4e6f2 Z "D"
merging d merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark') warning: conflicts while merging d! (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 --stop $ hg rebase --stop
1 new orphan changesets 1 new orphan changesets
$ hg log -GT "{rev}: {node|short} '{desc}' bookmarks: {bookmarks}\n" $ hg log -GT "{rev}: {node|short} '{desc}' bookmarks: {bookmarks}\n"
o 7: 9c86c650b686 'C' bookmarks: Y o 7: 9c86c650b686 'C' bookmarks: Y

tests/test-rebase-parameters.t

created new head created new head
$ 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 tip "c2b"
note: not rebasing 2:e4e3f3546619 "c2b" (tip), its destination already has all its changes note: not rebasing 2:e4e3f3546619 tip "c2b", 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 ..
$ hg clone -q -u . b b2 $ hg clone -q -u . b b2
$ cd b2 $ cd b2
$ hg rebase -s 2 -d 1 --tool internal:other $ hg rebase -s 2 -d 1 --tool internal:other
rebasing 2:e4e3f3546619 "c2b" (tip) rebasing 2:e4e3f3546619 tip "c2b"
saved backup bundle to $TESTTMP/b2/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg saved backup bundle to $TESTTMP/b2/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg
$ hg cat c2 $ hg cat c2
c2b c2b
$ cd .. $ cd ..
$ hg clone -q -u . b b3 $ hg clone -q -u . b b3
$ cd b3 $ cd b3
$ hg rebase -s 2 -d 1 --tool internal:fail $ hg rebase -s 2 -d 1 --tool internal:fail
rebasing 2:e4e3f3546619 "c2b" (tip) rebasing 2:e4e3f3546619 tip "c2b"
unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1] [1]
$ hg summary $ hg summary
parent: 1:56daeba07f4b parent: 1:56daeba07f4b
c2 c2
branch: default branch: default
commit: 1 unresolved (clean) commit: 1 unresolved (clean)
update: 1 new changesets, 2 branch heads (merge) update: 1 new changesets, 2 branch heads (merge)
phases: 3 draft phases: 3 draft
rebase: 0 rebased, 1 remaining (rebase --continue) rebase: 0 rebased, 1 remaining (rebase --continue)
$ hg resolve -l $ hg resolve -l
U c2 U c2
$ hg resolve -m c2 $ hg resolve -m c2
(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 tip "c2b"
note: not rebasing 2:e4e3f3546619 "c2b" (tip), its destination already has all its changes note: not rebasing 2:e4e3f3546619 tip "c2b", 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-partial.t

$ rebasewithdag -r C+D -d B <<EOF $ rebasewithdag -r C+D -d B <<EOF
> C > C
> | > |
> B D > B D
> |/ > |/
> A > A
> EOF > EOF
rebasing 2:b18e25de2cf5 "D" (D) rebasing 2:b18e25de2cf5 D "D"
already rebased 3:26805aba1e60 "C" (C tip) already rebased 3:26805aba1e60 C tip "C"
o 4: fe3b4c6498fa D o 4: fe3b4c6498fa D
| |
| o 3: 26805aba1e60 C | o 3: 26805aba1e60 C
|/ |/
| x 2: b18e25de2cf5 D | x 2: b18e25de2cf5 D
| | | |
o | 1: 112478962961 B o | 1: 112478962961 B
|/ |/
o 0: 426bada5c675 A o 0: 426bada5c675 A
Can collapse commits even if one is already in the right place Can collapse commits even if one is already in the right place
$ rebasewithdag --collapse -r C+D -d B <<EOF $ rebasewithdag --collapse -r C+D -d B <<EOF
> C > C
> | > |
> B D > B D
> |/ > |/
> A > A
> EOF > EOF
rebasing 2:b18e25de2cf5 "D" (D) rebasing 2:b18e25de2cf5 D "D"
rebasing 3:26805aba1e60 "C" (C tip) rebasing 3:26805aba1e60 C tip "C"
o 4: a2493f4ace65 Collapsed revision o 4: a2493f4ace65 Collapsed revision
| * D | * D
| * C | * C
| x 3: 26805aba1e60 C | x 3: 26805aba1e60 C
|/ |/
| x 2: b18e25de2cf5 D | x 2: b18e25de2cf5 D
| | | |
o | 1: 112478962961 B o | 1: 112478962961 B
|/ |/
o 0: 426bada5c675 A o 0: 426bada5c675 A
Abort doesn't lose the commits that were already in the right place Abort doesn't lose the commits that were already in the right place
$ hg init abort $ hg init abort
$ cd abort $ cd abort
$ hg debugdrawdag <<EOF $ hg debugdrawdag <<EOF
> C > C
> | > |
> B D # B/file = B > B D # B/file = B
> |/ # D/file = D > |/ # D/file = D
> A > A
> EOF > EOF
$ hg rebase -r C+D -d B $ hg rebase -r C+D -d B
rebasing 2:ef8c0fe0897b "D" (D) rebasing 2:ef8c0fe0897b D "D"
merging file merging file
warning: conflicts while merging file! (edit, then use 'hg resolve --mark') warning: conflicts while merging file! (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
$ hg tglog $ hg tglog
o 3: 79f6d6ab7b14 C o 3: 79f6d6ab7b14 C
> D > D
> | > |
> C > C
> | > |
> B > B
> | > |
> A > A
> EOF > EOF
already rebased 1:112478962961 "B" (B) already rebased 1:112478962961 B "B"
rebasing 3:f585351a92f8 "D" (D tip) rebasing 3:f585351a92f8 D tip "D"
o 4: 1e6da8103bc7 D o 4: 1e6da8103bc7 D
| |
| x 3: f585351a92f8 D | x 3: f585351a92f8 D
| | | |
| o 2: 26805aba1e60 C | o 2: 26805aba1e60 C
|/ |/
o 1: 112478962961 B o 1: 112478962961 B
| |
o 0: 426bada5c675 A o 0: 426bada5c675 A

tests/test-rebase-rename.t

--- /dev/null --- /dev/null
+++ b/d/x +++ b/d/x
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+x +x
Rebase the revision containing the rename: Rebase the revision containing the rename:
$ hg rebase -s 3 -d 2 $ hg rebase -s 3 -d 2
rebasing 3:73a3ee40125d "rename A" (tip) rebasing 3:73a3ee40125d tip "rename A"
saved backup bundle to $TESTTMP/a/.hg/strip-backup/73a3ee40125d-1d78ebcf-rebase.hg saved backup bundle to $TESTTMP/a/.hg/strip-backup/73a3ee40125d-1d78ebcf-rebase.hg
$ hg tglog $ hg tglog
@ 3: 032a9b75e83b 'rename A' @ 3: 032a9b75e83b 'rename A'
| |
o 2: 220d0626d185 'rename B' o 2: 220d0626d185 'rename B'
| |
o 1: 3ab5da9a5c01 'B' o 1: 3ab5da9a5c01 'B'
| | | |
| o 2: 220d0626d185 'rename B' | o 2: 220d0626d185 'rename B'
|/ |/
o 1: 3ab5da9a5c01 'B' o 1: 3ab5da9a5c01 'B'
| |
o 0: 1994f17a630e 'A' o 0: 1994f17a630e 'A'
$ hg rebase -s 5 -d 4 $ hg rebase -s 5 -d 4
rebasing 5:af8ad1f97097 "E" (tip) rebasing 5:af8ad1f97097 tip "E"
note: not rebasing 5:af8ad1f97097 "E" (tip), its destination already has all its changes note: not rebasing 5:af8ad1f97097 tip "E", its destination already has all its changes
saved backup bundle to $TESTTMP/a/.hg/strip-backup/af8ad1f97097-c3e90708-rebase.hg saved backup bundle to $TESTTMP/a/.hg/strip-backup/af8ad1f97097-c3e90708-rebase.hg
$ hg tglog $ hg tglog
@ 4: 60f545c27784 'E' @ 4: 60f545c27784 'E'
| |
| o 3: 032a9b75e83b 'rename A' | o 3: 032a9b75e83b 'rename A'
| | | |
| o 2: 220d0626d185 'rename B' | o 2: 220d0626d185 'rename B'
|/ |/
3: 0a8162ff18a8 'copy A' 3: 0a8162ff18a8 'copy A'
diff --git a/a b/a-copied diff --git a/a b/a-copied
copy from a copy from a
copy to a-copied copy to a-copied
Rebase the revision containing the copy: Rebase the revision containing the copy:
$ hg rebase -s 3 -d 2 $ hg rebase -s 3 -d 2
rebasing 3:0a8162ff18a8 "copy A" (tip) rebasing 3:0a8162ff18a8 tip "copy A"
saved backup bundle to $TESTTMP/b/.hg/strip-backup/0a8162ff18a8-dd06302a-rebase.hg saved backup bundle to $TESTTMP/b/.hg/strip-backup/0a8162ff18a8-dd06302a-rebase.hg
$ hg tglog $ hg tglog
@ 3: 98f6e6dbf45a 'copy A' @ 3: 98f6e6dbf45a 'copy A'
| |
o 2: 39e588434882 'copy B' o 2: 39e588434882 'copy B'
| |
o 1: 6c81ed0049f8 'B' o 1: 6c81ed0049f8 'B'
o 2: 480101d66d8d 'Unrelated change' o 2: 480101d66d8d 'Unrelated change'
| |
o 1: be44c61debd2 'Rename file1 to file2' o 1: be44c61debd2 'Rename file1 to file2'
| |
o 0: 8ce9a346991d 'Adding file1' o 0: 8ce9a346991d 'Adding file1'
$ hg rebase -s 4 -d 3 $ hg rebase -s 4 -d 3
rebasing 4:b918d683b091 "Another unrelated change" (tip) rebasing 4:b918d683b091 tip "Another unrelated change"
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/b918d683b091-3024bc57-rebase.hg saved backup bundle to $TESTTMP/repo/.hg/strip-backup/b918d683b091-3024bc57-rebase.hg
$ hg diff --stat -c . $ hg diff --stat -c .
unrelated.txt | 1 + unrelated.txt | 1 +
1 files changed, 1 insertions(+), 0 deletions(-) 1 files changed, 1 insertions(+), 0 deletions(-)
$ cd .. $ cd ..

tests/test-rebase-scenario-global.t

$ 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: not rebasing 6:eea13746799a "G", its destination already has all its changes note: not rebasing 6:eea13746799a "G", its destination already has all its changes
rebasing 7:02de42196ebe "H" (tip) rebasing 7:02de42196ebe tip "H"
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'
| |
o 4: 9520eea781bc 'E' o 4: 9520eea781bc 'E'
F onto B - G maintains E as parent: F onto B - G maintains E as parent:
$ hg clone -q -u . a a6 $ hg clone -q -u . a a6
$ cd a6 $ cd a6
$ hg rebase -s 5 -d 1 $ hg rebase -s 5 -d 1
rebasing 5:24b6387c8c8c "F" rebasing 5:24b6387c8c8c "F"
rebasing 6:eea13746799a "G" rebasing 6:eea13746799a "G"
rebasing 7:02de42196ebe "H" (tip) rebasing 7:02de42196ebe tip "H"
saved backup bundle to $TESTTMP/a6/.hg/strip-backup/24b6387c8c8c-c3fe765d-rebase.hg saved backup bundle to $TESTTMP/a6/.hg/strip-backup/24b6387c8c8c-c3fe765d-rebase.hg
$ hg tglog $ hg tglog
@ 7: c87be72f9641 'H' @ 7: c87be72f9641 'H'
| |
| o 6: 17badd73d4f1 'G' | o 6: 17badd73d4f1 'G'
|/| |/|
o | 5: 74fb9ed646c4 'F' o | 5: 74fb9ed646c4 'F'
[255] [255]
$ hg rebase -d 5 -r '1 + (6::)' $ hg rebase -d 5 -r '1 + (6::)'
abort: cannot rebase public changesets abort: cannot rebase public changesets
(see 'hg help phases' for details) (see 'hg help phases' for details)
[255] [255]
$ hg rebase -d 5 -b 6 --keep $ hg rebase -d 5 -b 6 --keep
rebasing 6:e1c4361dd923 "C" rebasing 6:e1c4361dd923 "C"
rebasing 7:c9659aac0000 "D" (tip) rebasing 7:c9659aac0000 tip "D"
Check rebasing mutable changeset Check rebasing mutable changeset
Source phase greater or equal to destination phase: new changeset get the phase of source: Source phase greater or equal to destination phase: new changeset get the phase of source:
$ hg id -n $ hg id -n
5 5
$ hg rebase -s9 -d0 $ hg rebase -s9 -d0
rebasing 9:2b23e52411f4 "D" (tip) rebasing 9:2b23e52411f4 tip "D"
saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2b23e52411f4-f942decf-rebase.hg saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2b23e52411f4-f942decf-rebase.hg
$ hg id -n # check we updated back to parent $ hg id -n # check we updated back to parent
5 5
$ hg log --template "{phase}\n" -r 9 $ hg log --template "{phase}\n" -r 9
draft draft
$ hg rebase -s9 -d1 $ hg rebase -s9 -d1
rebasing 9:2cb10d0cfc6c "D" (tip) rebasing 9:2cb10d0cfc6c tip "D"
saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2cb10d0cfc6c-ddb0f256-rebase.hg saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2cb10d0cfc6c-ddb0f256-rebase.hg
$ hg log --template "{phase}\n" -r 9 $ hg log --template "{phase}\n" -r 9
draft draft
$ hg phase --force --secret 9 $ hg phase --force --secret 9
$ hg rebase -s9 -d0 $ hg rebase -s9 -d0
rebasing 9:c5b12b67163a "D" (tip) rebasing 9:c5b12b67163a tip "D"
saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c5b12b67163a-4e372053-rebase.hg saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c5b12b67163a-4e372053-rebase.hg
$ hg log --template "{phase}\n" -r 9 $ hg log --template "{phase}\n" -r 9
secret secret
$ hg rebase -s9 -d1 $ hg rebase -s9 -d1
rebasing 9:2a0524f868ac "D" (tip) rebasing 9:2a0524f868ac tip "D"
saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2a0524f868ac-cefd8574-rebase.hg saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2a0524f868ac-cefd8574-rebase.hg
$ hg log --template "{phase}\n" -r 9 $ hg log --template "{phase}\n" -r 9
secret secret
Source phase lower than destination phase: new changeset get the phase of destination: Source phase lower than destination phase: new changeset get the phase of destination:
$ hg rebase -s8 -d9 $ hg rebase -s8 -d9
rebasing 8:6d4f22462821 "C" rebasing 8:6d4f22462821 "C"
saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6d4f22462821-3441f70b-rebase.hg saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6d4f22462821-3441f70b-rebase.hg
$ hg log --template "{phase}\n" -r 'rev(9)' $ hg log --template "{phase}\n" -r 'rev(9)'
abort: cannot rebase changeset with children abort: cannot rebase changeset with children
(use --keep to keep original changesets) (use --keep to keep original changesets)
[255] [255]
$ hg rebase -r '2::8' -d 1 -k $ hg rebase -r '2::8' -d 1 -k
rebasing 2:c9e50f6cdc55 "C" rebasing 2:c9e50f6cdc55 "C"
rebasing 3:ffd453c31098 "D" rebasing 3:ffd453c31098 "D"
rebasing 6:3d8a618087a7 "G" rebasing 6:3d8a618087a7 "G"
rebasing 7:72434a4e60b0 "H" rebasing 7:72434a4e60b0 "H"
rebasing 8:479ddb54a924 "I" (tip) rebasing 8:479ddb54a924 tip "I"
$ hg tglog $ hg tglog
o 13: 9bf1d9358a90 'I' o 13: 9bf1d9358a90 'I'
| |
o 12: 274623a778d4 'H' o 12: 274623a778d4 'H'
| |
o 11: ab8c8617c8e8 'G' o 11: ab8c8617c8e8 'G'
| |
o 10: c8cbf59f70da 'D' o 10: c8cbf59f70da 'D'
$ hg rebase -r '3::8' -d 1 $ hg rebase -r '3::8' -d 1
abort: cannot rebase changeset with children abort: cannot rebase changeset with children
(use --keep to keep original changesets) (use --keep to keep original changesets)
[255] [255]
$ hg rebase -r '3::8' -d 1 --keep $ hg rebase -r '3::8' -d 1 --keep
rebasing 3:ffd453c31098 "D" rebasing 3:ffd453c31098 "D"
rebasing 6:3d8a618087a7 "G" rebasing 6:3d8a618087a7 "G"
rebasing 7:72434a4e60b0 "H" rebasing 7:72434a4e60b0 "H"
rebasing 8:479ddb54a924 "I" (tip) rebasing 8:479ddb54a924 tip "I"
$ hg tglog $ hg tglog
o 12: 9d7da0053b1c 'I' o 12: 9d7da0053b1c 'I'
| |
o 11: 8fbd00952cbc 'H' o 11: 8fbd00952cbc 'H'
| |
o 10: 51d434a615ee 'G' o 10: 51d434a615ee 'G'
| |
o 9: a9c125634b0b 'D' o 9: a9c125634b0b 'D'
rebase on ancestor with revset rebase on ancestor with revset
$ hg clone -q -u . ah ah5 $ hg clone -q -u . ah ah5
$ cd ah5 $ cd ah5
$ hg rebase -r '6::' -d 2 $ hg rebase -r '6::' -d 2
rebasing 6:3d8a618087a7 "G" rebasing 6:3d8a618087a7 "G"
rebasing 7:72434a4e60b0 "H" rebasing 7:72434a4e60b0 "H"
rebasing 8:479ddb54a924 "I" (tip) rebasing 8:479ddb54a924 tip "I"
saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-b4f73f31-rebase.hg saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-b4f73f31-rebase.hg
$ hg tglog $ hg tglog
o 8: fcb52e68a694 'I' o 8: fcb52e68a694 'I'
| |
o 7: 77bd65cd7600 'H' o 7: 77bd65cd7600 'H'
| |
o 6: 12d0e738fb18 'G' o 6: 12d0e738fb18 'G'
| |
$ hg clone -q -u . ah ah6 $ hg clone -q -u . ah ah6
$ cd ah6 $ cd ah6
$ hg rebase -r '(4+6)::' -d 1 $ hg rebase -r '(4+6)::' -d 1
rebasing 4:c01897464e7f "E" rebasing 4:c01897464e7f "E"
rebasing 5:41bfcc75ed73 "F" rebasing 5:41bfcc75ed73 "F"
rebasing 6:3d8a618087a7 "G" rebasing 6:3d8a618087a7 "G"
rebasing 7:72434a4e60b0 "H" rebasing 7:72434a4e60b0 "H"
rebasing 8:479ddb54a924 "I" (tip) rebasing 8:479ddb54a924 tip "I"
saved backup bundle to $TESTTMP/ah6/.hg/strip-backup/3d8a618087a7-aae93a24-rebase.hg saved backup bundle to $TESTTMP/ah6/.hg/strip-backup/3d8a618087a7-aae93a24-rebase.hg
$ hg tglog $ hg tglog
o 8: 9136df9a87cf 'I' o 8: 9136df9a87cf 'I'
| |
o 7: 23e8f30da832 'H' o 7: 23e8f30da832 'H'
| |
o 6: b0efe8534e8b 'G' o 6: b0efe8534e8b 'G'
| |
| o 1: 42ccdea3bb16 'B' | o 1: 42ccdea3bb16 'B'
|/ |/
o 0: cd010b8cd998 'A' o 0: cd010b8cd998 'A'
(actual test) (actual test)
$ hg rebase --dest 'desc(G)' --rev 'desc(K) + desc(I)' $ hg rebase --dest 'desc(G)' --rev 'desc(K) + desc(I)'
rebasing 8:e7ec4e813ba6 "I" rebasing 8:e7ec4e813ba6 "I"
rebasing 10:23a4ace37988 "K" (tip) rebasing 10:23a4ace37988 tip "K"
saved backup bundle to $TESTTMP/a8/.hg/strip-backup/23a4ace37988-b06984b3-rebase.hg saved backup bundle to $TESTTMP/a8/.hg/strip-backup/23a4ace37988-b06984b3-rebase.hg
$ hg log --rev 'children(desc(G))' $ hg log --rev 'children(desc(G))'
changeset: 9:adb617877056 changeset: 9:adb617877056
parent: 6:eea13746799a parent: 6:eea13746799a
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: I summary: I
$ touch subfile $ touch subfile
$ hg add subfile $ hg add subfile
$ hg commit -m 'second source with subdir' $ hg commit -m 'second source with subdir'
$ hg rebase -b . -d 1 --traceback $ hg rebase -b . -d 1 --traceback
rebasing 2:779a07b1b7a0 "first source commit" rebasing 2:779a07b1b7a0 "first source commit"
current directory was removed (rmcwd !) current directory was removed (rmcwd !)
(consider changing to repo root: $TESTTMP/cwd-vanish) (rmcwd !) (consider changing to repo root: $TESTTMP/cwd-vanish) (rmcwd !)
rebasing 3:a7d6f3a00bf3 "second source with subdir" (tip) rebasing 3:a7d6f3a00bf3 tip "second source with subdir"
saved backup bundle to $TESTTMP/cwd-vanish/.hg/strip-backup/779a07b1b7a0-853e0073-rebase.hg saved backup bundle to $TESTTMP/cwd-vanish/.hg/strip-backup/779a07b1b7a0-853e0073-rebase.hg
Get back to the root of cwd-vanish. Note that even though `cd ..` Get back to the root of cwd-vanish. Note that even though `cd ..`
works on most systems, it does not work on FreeBSD 10, so we use an works on most systems, it does not work on FreeBSD 10, so we use an
absolute path to get back to the repository. absolute path to get back to the repository.
$ cd $TESTTMP $ cd $TESTTMP
Test that rebase is done in topo order (issue5370) Test that rebase is done in topo order (issue5370)
$ hg debugdrawdag <<'EOS' $ hg debugdrawdag <<'EOS'
> B C > B C
> |/ > |/
> A > A
> EOS > EOS
$ hg rebase -s C -d B $ hg rebase -s C -d B
rebasing 2:dc0947a82db8 "C" (C tip) rebasing 2:dc0947a82db8 C tip "C"
$ [ -f .hg/rebasestate ] && echo 'WRONG: rebasestate should not exist' $ [ -f .hg/rebasestate ] && echo 'WRONG: rebasestate should not exist'
[1] [1]

tests/test-rebase-transaction.t

> | | > | |
> | C # C/conflict=C > | C # C/conflict=C
> | | > | |
> Y B > Y B
> |/ > |/
> A > A
> EOF > EOF
$ hg rebase --collapse -b D -d Z $ hg rebase --collapse -b D -d Z
rebasing 1:112478962961 "B" (B) rebasing 1:112478962961 B "B"
rebasing 3:c26739dbe603 "C" (C) rebasing 3:c26739dbe603 C "C"
merging conflict merging conflict
warning: conflicts while merging conflict! (edit, then use 'hg resolve --mark') warning: conflicts while merging conflict! (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
o 5: D o 5: D
| |
| @ 4: Z | @ 4: Z
A B A B
A C A C
? conflict.orig ? conflict.orig
$ echo resolved > conflict $ echo resolved > conflict
$ hg resolve -m $ hg resolve -m
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg continue $ hg continue
already rebased 1:112478962961 "B" (B) as 79bc8f4973ce already rebased 1:112478962961 B "B" as 79bc8f4973ce
rebasing 3:c26739dbe603 "C" (C) rebasing 3:c26739dbe603 C "C"
rebasing 5:d24bb333861c "D" (D tip) rebasing 5:d24bb333861c D tip "D"
saved backup bundle to $TESTTMP/collapse-conflict/.hg/strip-backup/112478962961-b5b34645-rebase.hg saved backup bundle to $TESTTMP/collapse-conflict/.hg/strip-backup/112478962961-b5b34645-rebase.hg
$ hg tglog $ hg tglog
o 3: Collapsed revision o 3: Collapsed revision
| * B | * B
| * C | * C
| * D | * D
o 2: Z o 2: Z
| |
> | | > | |
> | C > | C
> | | > | |
> Y B > Y B
> |/ > |/
> A > A
> EOF > EOF
$ HGEDITOR=false hg --config ui.interactive=1 rebase --collapse -b D -d Z $ HGEDITOR=false hg --config ui.interactive=1 rebase --collapse -b D -d Z
rebasing 1:112478962961 "B" (B) rebasing 1:112478962961 B "B"
rebasing 3:26805aba1e60 "C" (C) rebasing 3:26805aba1e60 C "C"
rebasing 5:f585351a92f8 "D" (D tip) rebasing 5:f585351a92f8 D tip "D"
transaction abort! transaction abort!
rollback completed rollback completed
abort: edit failed: false exited with status 1 abort: edit failed: false exited with status 1
[255] [255]
$ hg tglog $ hg tglog
o 5: D o 5: D
| |
| o 4: Z | o 4: Z
| | | |
o | 3: C o | 3: C
| | | |
| o 2: Y | o 2: Y
| | | |
o | 1: B o | 1: B
|/ |/
o 0: A o 0: A
$ hg continue $ hg continue
rebasing 1:112478962961 "B" (B) rebasing 1:112478962961 B "B"
rebasing 3:26805aba1e60 "C" (C) rebasing 3:26805aba1e60 C "C"
rebasing 5:f585351a92f8 "D" (D tip) rebasing 5:f585351a92f8 D tip "D"
saved backup bundle to $TESTTMP/collapse-cancel-editor/.hg/strip-backup/112478962961-cb2a9b47-rebase.hg saved backup bundle to $TESTTMP/collapse-cancel-editor/.hg/strip-backup/112478962961-cb2a9b47-rebase.hg
$ hg tglog $ hg tglog
o 3: Collapsed revision o 3: Collapsed revision
| * B | * B
| * C | * C
| * D | * D
o 2: Z o 2: Z
| |
o 1: Y o 1: Y
| |
o 0: A o 0: A
$ cd .. $ cd ..

tests/test-remotefilelog-bgprefetch.t

3 files updated, 0 files merged, 2 files removed, 0 files unresolved 3 files updated, 0 files merged, 2 files removed, 0 files unresolved
(leaving bookmark temporary) (leaving bookmark temporary)
$ clearcache $ clearcache
$ find $CACHEDIR -type f | sort $ find $CACHEDIR -type f | sort
.. The following output line about files fetches is globed because it is .. The following output line about files fetches is globed because it is
.. flaky, the core the test is checked when checking the cache dir, so .. flaky, the core the test is checked when checking the cache dir, so
.. hopefully this flakyness is not hiding any actual bug. .. hopefully this flakyness is not hiding any actual bug.
$ hg rebase -s temporary -d foo $ hg rebase -s temporary -d foo
rebasing 3:d9cf06e3b5b6 "b" (temporary tip) rebasing 3:d9cf06e3b5b6 tip temporary "b"
saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/d9cf06e3b5b6-e5c3dc63-rebase.hg saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/d9cf06e3b5b6-e5c3dc63-rebase.hg
? files fetched over ? fetches - (? misses, 0.00% hit ratio) over *s (glob) ? files fetched over ? fetches - (? misses, 0.00% hit ratio) over *s (glob)
$ find $CACHEDIR -type f | sort $ find $CACHEDIR -type f | sort
$TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histidx $TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histidx
$TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histpack $TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histpack
$TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407.dataidx $TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407.dataidx
$TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407.datapack $TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407.datapack
$TESTTMP/hgcache/repos $TESTTMP/hgcache/repos

tests/test-remotefilelog-linknodes.t

0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo x >> x $ echo x >> x
$ hg commit -qAm xx $ hg commit -qAm xx
$ hg log -f x --template "{node|short}\n" $ hg log -f x --template "{node|short}\n"
0632994590a8 0632994590a8
b292c1e3311f b292c1e3311f
$ hg rebase -d 1 $ hg rebase -d 1
rebasing 2:0632994590a8 "xx" (tip) rebasing 2:0632994590a8 tip "xx"
saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/0632994590a8-0bc786d8-rebase.hg (glob) saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/0632994590a8-0bc786d8-rebase.hg (glob)
$ hg log -f x --template "{node|short}\n" $ hg log -f x --template "{node|short}\n"
81deab2073bc 81deab2073bc
b292c1e3311f b292c1e3311f
# Rebase back, log -f still works # Rebase back, log -f still works
$ hg rebase -d 0 -r 2 $ hg rebase -d 0 -r 2
rebasing 2:81deab2073bc "xx" (tip) rebasing 2:81deab2073bc tip "xx"
saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/81deab2073bc-80cb4fda-rebase.hg (glob) saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/81deab2073bc-80cb4fda-rebase.hg (glob)
$ hg log -f x --template "{node|short}\n" $ hg log -f x --template "{node|short}\n"
b3fca10fb42d b3fca10fb42d
b292c1e3311f b292c1e3311f
$ hg rebase -d 1 -r 2 $ hg rebase -d 1 -r 2
rebasing 2:b3fca10fb42d "xx" (tip) rebasing 2:b3fca10fb42d tip "xx"
saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/b3fca10fb42d-da73a0c7-rebase.hg (glob) saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/b3fca10fb42d-da73a0c7-rebase.hg (glob)
$ cd .. $ cd ..
# Reset repos # Reset repos
$ clearcache $ clearcache
$ rm -rf master $ rm -rf master

tests/test-remotefilelog-sparse.t

$ cd ../shallow $ cd ../shallow
$ hg up -q 1 $ hg up -q 1
$ hg pull -q $ hg pull -q
$ hg debugsparse -I z $ hg debugsparse -I z
$ clearcache $ clearcache
$ hg prefetch -r '. + .^' -I x -I z $ hg prefetch -r '. + .^' -I x -I z
4 files fetched over 1 fetches - (4 misses, 0.00% hit ratio) over * (glob) 4 files fetched over 1 fetches - (4 misses, 0.00% hit ratio) over * (glob)
$ hg rebase -d 2 --keep $ hg rebase -d 2 --keep
rebasing 1:876b1317060d "x2" (foo) rebasing 1:876b1317060d foo "x2"

tests/test-shelve2.t

$ printf 'a\nx\ny\nz\n' > x $ printf 'a\nx\ny\nz\n' > x
$ hg commit -Aqm xyz $ hg commit -Aqm xyz
$ echo c >> z $ echo c >> z
$ hg shelve $ hg shelve
shelved as default shelved as default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg rebase -d 6c103be8f4e4 --config extensions.rebase= $ hg rebase -d 6c103be8f4e4 --config extensions.rebase=
rebasing 2:323bfa07f744 "xyz"( \(tip\))? (re) rebasing 2:323bfa07f744( tip)? "xyz" (re)
merging x merging x
saved backup bundle to \$TESTTMP/shelverebase/.hg/strip-backup/323bfa07f744-(78114325|7ae538ef)-rebase.hg (re) saved backup bundle to \$TESTTMP/shelverebase/.hg/strip-backup/323bfa07f744-(78114325|7ae538ef)-rebase.hg (re)
$ hg unshelve $ hg unshelve
unshelving change 'default' unshelving change 'default'
rebasing shelved changes rebasing shelved changes
$ hg status $ hg status
M z M z

tests/test-sparse.t

show show
show2 show2
For now, manually remove the files For now, manually remove the files
$ rm hide hide3 $ rm hide hide3
Verify rebase temporarily includes excluded files Verify rebase temporarily includes excluded files
$ hg rebase -d 1 -r 2 --config extensions.rebase= $ hg rebase -d 1 -r 2 --config extensions.rebase=
rebasing 2:b91df4f39e75 "edit hide" (tip) rebasing 2:b91df4f39e75 tip "edit hide"
temporarily included 2 file(s) in the sparse checkout for merging temporarily included 2 file(s) in the sparse checkout for merging
merging hide merging hide
warning: conflicts while merging hide! (edit, then use 'hg resolve --mark') warning: conflicts while merging hide! (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 debugsparse $ hg debugsparse
[exclude] [exclude]
$ hg status $ hg status
M show M show
? show2 ? show2
Verify rebase succeeds if all changed files are in sparse checkout Verify rebase succeeds if all changed files are in sparse checkout
$ hg commit -Aqm "add show2" $ hg commit -Aqm "add show2"
$ hg rebase -d 1 --config extensions.rebase= $ hg rebase -d 1 --config extensions.rebase=
rebasing 2:bdde55290160 "add show2" (tip) rebasing 2:bdde55290160 tip "add show2"
saved backup bundle to $TESTTMP/myrepo/.hg/strip-backup/bdde55290160-216ed9c6-rebase.hg saved backup bundle to $TESTTMP/myrepo/.hg/strip-backup/bdde55290160-216ed9c6-rebase.hg
Verify log --sparse only shows commits that affect the sparse checkout Verify log --sparse only shows commits that affect the sparse checkout
$ hg log -T '{rev} ' $ hg log -T '{rev} '
2 1 0 (no-eol) 2 1 0 (no-eol)
$ hg log --sparse -T '{rev} ' $ hg log --sparse -T '{rev} '
2 0 (no-eol) 2 0 (no-eol)

tests/test-split.t

$ echo 3 >> d $ echo 3 >> d
$ hg ci -m d3 $ hg ci -m d3
$ hg bookmark -i d3 $ hg bookmark -i d3
$ hg up '.^' -q $ hg up '.^' -q
$ hg bookmark d2 $ hg bookmark d2
$ cp -R . ../d $ cp -R . ../d
$ runsplit -r 1 | grep rebasing $ runsplit -r 1 | grep rebasing
rebasing 2:b5c5ea414030 "d1" (d1) rebasing 2:b5c5ea414030 d1 "d1"
rebasing 3:f4a0a8d004cc "d2" (d2) rebasing 3:f4a0a8d004cc d2 "d2"
rebasing 4:777940761eba "d3" (d3) rebasing 4:777940761eba d3 "d3"
#if obsstore-off #if obsstore-off
$ hg bookmark $ hg bookmark
d1 4:c4b449ef030e d1 4:c4b449ef030e
* d2 5:c9dd00ab36a3 * d2 5:c9dd00ab36a3
d3 6:19f476bc865c d3 6:19f476bc865c
r1 0:a61bcde8c529 r1 0:a61bcde8c529
r2 3:00eebaf8d2e2 r2 3:00eebaf8d2e2
$ hg glog -p $ hg glog -p