This is an archive of the discontinued Mercurial Phabricator instance.

Er, well... I guess reordering the chain broke phabricator? Originally I had A -> B -> C, as suggested I reordered this to B -> A -> C with appropriate changes, and how hg phabsend crashes with:

abort: Conduit Error (ERR-CONDUIT-CORE): Graph cycle detected (type=5, cycle=PHID-DREV-jpk3ymcax5ovexpph646, PHID-DREV-ft6irv5eikzqgw4mezxq, PHID-DREV-jpk3ymcax5ovexpph646)

Is this a known error? Should I try abandoning all three commits and re-uploading them?

In D8730#130362, @dploch wrote:
Er, well... I guess reordering the chain broke phabricator? Originally I had A -> B -> C, as suggested I reordered this to B -> A -> C with appropriate changes, and how hg phabsend crashes with:
abort: Conduit Error (ERR-CONDUIT-CORE): Graph cycle detected (type=5, cycle=PHID-DREV-jpk3ymcax5ovexpph646, PHID-DREV-ft6irv5eikzqgw4mezxq, PHID-DREV-jpk3ymcax5ovexpph646)
Is this a known error? Should I try abandoning all three commits and re-uploading them?

I think that's a know problem (known to me anyway :)). You can fix it here in Phabricator's UI. I'll do that for you.

martinvonz removed a parent revision: D8713: error: normalize "unresolved conflicts" error messages with a custom class.Jul 13 2020, 11:45 PM

martinvonz added a child revision: D8713: error: normalize "unresolved conflicts" error messages with a custom class.

martinvonz removed a child revision: D8714: state: support validated declaration of nested unfinished ops.

martinvonz added a parent revision: D8712: black: format some files in preparation for subsequent changes.

! In D8730#130363, @martinvonz wrote:
I think that's a know problem (known to me anyway :)). You can fix it here in Phabricator's UI. I'll do that for you.

Thanks, that fixed it :)

+1 for unification. Should we try to align on the message from hg merge` instead?

In D8730#130706, @marmoute wrote:

+1 for unification. Should we try to align on the message from hg merge` instead?

You mean this one?

0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon

The file stats may be useful. I suppose we have that information available here too (but out of scope for this patch). I'm surprised that the text part doesn't mention running hg commit to continue the merge. It seems like it should.

Update also have some clearer precursors message. eg:

warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark')
2 files updated, 1 files merged, 3 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges

My general point is that if we are to unify and improve merge conflict related message, we should probably align things on what the main command for merging is: hg merge. (Possibly improving it in the process).

In D8730#130832, @marmoute wrote:
Update also have some clearer precursors message. eg:
warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark')
2 files updated, 1 files merged, 3 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges
My general point is that if we are to unify and improve merge conflict related message, we should probably align things on what the main command for merging is: hg merge. (Possibly improving it in the process).

Right, I agree with that, but I also don't want that to be a requirement for the series to get accepted. In other words, I'd be happy to see that larger unification, but I'd leave it up to Daniel to decide if it's worth his time.

In D8730#130835, @martinvonz wrote:
In D8730#130832, @marmoute wrote:
Update also have some clearer precursors message. eg:
warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark')
2 files updated, 1 files merged, 3 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges
My general point is that if we are to unify and improve merge conflict related message, we should probably align things on what the main command for merging is: hg merge. (Possibly improving it in the process).
Right, I agree with that, but I also don't want that to be a requirement for the series to get accepted. In other words, I'd be happy to see that larger unification, but I'd leave it up to Daniel to decide if it's worth his time.

I'm happy to tweak the error message for rebase+unshelve to be closer to 'merge' if that makes a larger unification easier, but I'm not sure what change is actually being proposed - merge is also fundamentally different because there is no hg merge --continue. It seems it would be better to change the merge message to more closely resemble the other state messages, but that change should probably be in a separate patch.

In D8730#130917, @dploch wrote:
In D8730#130835, @martinvonz wrote:
In D8730#130832, @marmoute wrote:
Update also have some clearer precursors message. eg:
warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark')
2 files updated, 1 files merged, 3 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges
My general point is that if we are to unify and improve merge conflict related message, we should probably align things on what the main command for merging is: hg merge. (Possibly improving it in the process).
Right, I agree with that, but I also don't want that to be a requirement for the series to get accepted. In other words, I'd be happy to see that larger unification, but I'd leave it up to Daniel to decide if it's worth his time.
I'm happy to tweak the error message for rebase+unshelve to be closer to 'merge' if that makes a larger unification easier, but I'm not sure what change is actually being proposed - merge is also fundamentally different because there is no hg merge --continue. It seems it would be better to change the merge message to more closely resemble the other state messages, but that change should probably be in a separate patch.

Agree with Daniel that there is no hg merge --continue and hence won't be trivial to merge messages. Anyways, this is an improvement which is good to go on it's own, hence queuing it. Thank you!

This revision is now accepted and ready to land.Jul 17 2020, 1:05 PM

dploch added a commit: rHGdc5e5577af39: error: unify the error message formats for 'rebase' and 'unshelve'.Jul 17 2020, 2:04 PM

Closed by commit rHGdc5e5577af39: error: unify the error message formats for 'rebase' and 'unshelve' (authored by dploch). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			hgext/rebase.py (4 lines)
M			tests/test-absorb-unfinished.t (2 lines)
M			tests/test-bookmarks-rebase.t (4 lines)
M			tests/test-copytrace-heuristics.t (6 lines)
M			tests/test-fix.t (2 lines)
M			tests/test-largefiles-update.t (2 lines)
M			tests/test-merge-halt.t (2 lines)
M			tests/test-narrow-rebase.t (2 lines)
M			tests/test-rebase-abort.t (14 lines)
M			tests/test-rebase-backup.t (4 lines)
M			tests/test-rebase-bookmarks.t (2 lines)
M			tests/test-rebase-check-restore.t (4 lines)
M			tests/test-rebase-collapse.t (8 lines)
M			tests/test-rebase-conflicts.t (10 lines)
M			tests/test-rebase-dest.t (2 lines)
M			tests/test-rebase-detach.t (2 lines)
M			tests/test-rebase-inmemory.t (6 lines)
M			tests/test-rebase-interruptions.t (14 lines)
M			tests/test-rebase-mq-skip.t (2 lines)
M			tests/test-rebase-mq.t (4 lines)
M			tests/test-rebase-obsolete.t (16 lines)
M			tests/test-rebase-parameters.t (2 lines)
M			tests/test-rebase-partial.t (2 lines)
M			tests/test-rebase-transaction.t (2 lines)
M			tests/test-resolve.t (2 lines)
M			tests/test-sparse-profiles.t (2 lines)
M			tests/test-sparse.t (2 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	21842		Jul 10 2020, 9:04 PM	★	★
Diff 2	21872		Jul 13 2020, 7:46 PM	★	★
Diff 3	21956	rHGdc5e5577af3945ee80a2734b3ab0c7a4b9055f57	Jul 13 2020, 7:42 PM	★	★

Status	Author	Revision
Closed	dploch	D8714 state: support validated declaration of nested unfinished ops
Closed	dploch	D8713 error: normalize "unresolved conflicts" error messages with a custom class
Closed	dploch	D8730 error: unify the error message formats for 'rebase' and 'unshelve'
Abandoned	dploch	D8712 black: format some files in preparation for subsequent changes

Diff 21956

hgext/rebase.py

	wctx=self.wctx,			wctx=self.wctx,
	)			)
	if stats.unresolvedcount > 0:			if stats.unresolvedcount > 0:
	if self.inmemory:			if self.inmemory:
	raise error.InMemoryMergeConflictsError()			raise error.InMemoryMergeConflictsError()
	else:			else:
	raise error.InterventionRequired(			raise error.InterventionRequired(
	_(			_(
	b'unresolved conflicts (see hg '			b"unresolved conflicts (see 'hg "
	b'resolve, then hg rebase --continue)'			b"resolve', then 'hg rebase --continue')"
	)			)
	)			)
	if not self.collapsef:			if not self.collapsef:
	merging = p2 != nullrev			merging = p2 != nullrev
	editform = cmdutil.mergeeditform(merging, b'rebase')			editform = cmdutil.mergeeditform(merging, b'rebase')
	editor = cmdutil.getcommiteditor(			editor = cmdutil.getcommiteditor(
	editform=editform, **pycompat.strkwargs(opts)			editform=editform, **pycompat.strkwargs(opts)
	)			)

tests/test-absorb-unfinished.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 "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 "foo 2" (tip)
	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' or 'hg rebase --abort')			(use 'hg rebase --continue' or 'hg rebase --abort')
	[255]			[255]

tests/test-bookmarks-rebase.t

	$ 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 "4" (three tip)
	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 "4" (three tip)
	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-copytrace-heuristics.t

	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 "mode a" (tip)
	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

	Test when lca didn't modified the file that was moved			Test when lca didn't modified the file that was moved
	-----------------------------------------------------			-----------------------------------------------------

	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 "mod a" (tip)
	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

	When the sourcecommitlimit is small and we have more drafts, we use heuristics only			When the sourcecommitlimit is small and we have more drafts, we use heuristics only

	$ hg rebase -s 1 -d .			$ hg rebase -s 1 -d .
	rebasing 1:8b6e13696c38 "added more things to a"			rebasing 1:8b6e13696c38 "added more things to 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]

	But when we have "sourcecommitlimit > (no. of drafts from base to c1)", we do			But when we have "sourcecommitlimit > (no. of drafts from base to c1)", we do
	fullcopytracing			fullcopytracing

	$ hg rebase --abort			$ hg rebase --abort
	rebase aborted			rebase aborted
	$ hg rebase -s 1 -d . --config experimental.copytrace.sourcecommitlimit=100			$ hg rebase -s 1 -d . --config experimental.copytrace.sourcecommitlimit=100
	rebasing 1:8b6e13696c38 "added more things to a"			rebasing 1:8b6e13696c38 "added more things to a"
	merging foo/bar and a to foo/bar			merging foo/bar and a to foo/bar
	saved backup bundle to $TESTTMP/repo/repo/repo/.hg/strip-backup/8b6e13696c38-fc14ac83-rebase.hg			saved backup bundle to $TESTTMP/repo/repo/repo/.hg/strip-backup/8b6e13696c38-fc14ac83-rebase.hg
	$ cd ..			$ cd ..
	$ rm -rf repo			$ rm -rf repo

tests/test-fix.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 "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 "foo 2" (tip)
	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')
	[255]			[255]

	$ hg --config extensions.rebase= fix -r .			$ hg --config extensions.rebase= fix -r .

tests/test-largefiles-update.t

	> EOF			> EOF
	rebasing 1:72518492caa6 "#1"			rebasing 1:72518492caa6 "#1"
	largefile large1 has a merge conflict			largefile large1 has a merge conflict
	ancestor was 4669e532d5b2c093a78eca010077e708a071bb64			ancestor was 4669e532d5b2c093a78eca010077e708a071bb64
	you can keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5.			you can keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5.
	what do you want to do? o			what do you want to do? o
	merging normal1			merging normal1
	warning: conflicts while merging normal1! (edit, then use 'hg resolve --mark')			warning: conflicts while merging normal1! (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]
	$ cat .hglf/large1			$ cat .hglf/large1
	58e24f733a964da346e2407a2bee99d9001184f5			58e24f733a964da346e2407a2bee99d9001184f5
	$ cat large1			$ cat large1
	large1 in #1			large1 in #1
	$ rm normal1.orig			$ rm normal1.orig

	Test that rebase updates standins for manually modified largefiles at			Test that rebase updates standins for manually modified largefiles at

tests/test-merge-halt.t

	Testing on-failure=continue			Testing on-failure=continue
	$ echo on-failure=continue >> $HGRCPATH			$ echo on-failure=continue >> $HGRCPATH
	$ hg rebase -s 1 -d 2 --tool false			$ hg rebase -s 1 -d 2 --tool false
	rebasing 1:1f28a51c3c9b "c"			rebasing 1:1f28a51c3c9b "c"
	merging a			merging a
	merging b			merging b
	merging a failed!			merging a failed!
	merging b failed!			merging b failed!
	unresolved conflicts (see hg resolve, then hg rebase --continue)			unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
	[1]			[1]

	$ hg resolve --list			$ hg resolve --list
	U a			U a
	U b			U b

	$ hg rebase --abort			$ hg rebase --abort
	rebase aborted			rebase aborted

tests/test-narrow-rebase.t

	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 "conflicting inside/f1" (tip)
	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 "conflicting inside/f1" (tip)
	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

tests/test-rebase-abort.t


	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 "L2" (tip)
	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
	$ hg debugmergestate			$ hg debugmergestate
	local (dest): 3e046f2ecedb793b97ed32108086edd1a162f8bc			local (dest): 3e046f2ecedb793b97ed32108086edd1a162f8bc
	other (source): 46f0b057b5c061d276b91491c22151f78698abd2			other (source): 46f0b057b5c061d276b91491c22151f78698abd2
	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 "L2" (tip)
	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()"
	$ mv .hg/rebasestate.back .hg/rebasestate			$ mv .hg/rebasestate.back .hg/rebasestate

	$ hg continue			$ hg continue
	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 "C1" (tip)
	merging c			merging c
	warning: conflicts while merging c! (edit, then use 'hg resolve --mark')			warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
	unresolved conflicts (see hg resolve, then hg rebase --continue)			unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
	[1]			[1]

	$ hg tglog			$ hg tglog
	% 4:draft 'C1'			% 4:draft 'C1'
	\|			\|
	o 3:draft 'B bis'			o 3:draft 'B bis'
	\|			\|
	\| @ 2:secret 'C'			\| @ 2:secret 'C'
	\|/			\|/
	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 "C" (foo tip)
	merging c			merging c
	warning: conflicts while merging c! (edit, then use 'hg resolve --mark')			warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
	unresolved conflicts (see hg resolve, then hg rebase --continue)			unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
	[1]			[1]
	$ hg 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
	\|			\|
	\| o 2 c master			\| o 2 c master
	\| \|			\| \|
	$ 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 "b2" (foo tip)
	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

	$ echo "conflicting change 1" > foo.txt			$ echo "conflicting change 1" > foo.txt
	$ hg ci -m "conflicting 1"			$ hg ci -m "conflicting 1"
	created new head			created new head
	$ echo "conflicting change 2" > foo.txt			$ echo "conflicting change 2" > foo.txt
	$ hg ci -m "conflicting 2"			$ hg ci -m "conflicting 2"

	$ hg rebase -d 1 --tool 'internal:fail'			$ hg rebase -d 1 --tool 'internal:fail'
	rebasing 2:e4ea5cdc9789 "conflicting 1"			rebasing 2:e4ea5cdc9789 "conflicting 1"
	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 summary			$ hg summary
	parent: 3:b16646383533 tip			parent: 3:b16646383533 tip
	conflicting 2			conflicting 2
	branch: default			branch: default
	commit: (clean)			commit: (clean)
	$ hg commit -A -m 'disappear draft' -q			$ hg commit -A -m 'disappear draft' -q
	$ echo 'addedcontADDEDentadded' > root			$ echo 'addedcontADDEDentadded' > root
	commit will cause merge conflict on rebase			commit will cause merge conflict on rebase
	$ hg commit -m 'add content draft' -q			$ hg commit -m 'add content draft' -q

	$ hg rebase -d 'public()' --tool :merge -q			$ hg rebase -d 'public()' --tool :merge -q
	note: not rebasing 3:0682fd3dabf5 "disappear draft", its destination already has all its changes			note: not rebasing 3:0682fd3dabf5 "disappear draft", its destination already has all its changes
	warning: conflicts while merging root! (edit, then use 'hg resolve --mark')			warning: conflicts while merging root! (edit, then use 'hg resolve --mark')
	unresolved conflicts (see hg resolve, then hg rebase --continue)			unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
	[1]			[1]
	$ hg abort			$ hg abort
	rebase aborted			rebase aborted
	$ cd ..			$ cd ..

tests/test-rebase-backup.t

	> [rewrite]			> [rewrite]
	> backup-bundle = True			> backup-bundle = True
	> EOF			> EOF
	$ hg rebase -s 5 -d .			$ hg rebase -s 5 -d .
	rebasing 5:1f8148a544ee "b"			rebasing 5:1f8148a544ee "b"
	rebasing 6:f8bc7d28e573 "c"			rebasing 6:f8bc7d28e573 "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 rebase --abort			$ hg rebase --abort
	saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/818c1a43c916-2b644d96-backup.hg			saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/818c1a43c916-2b644d96-backup.hg
	rebase aborted			rebase aborted

	When backup-bundle = False:			When backup-bundle = False:
	$ cat << EOF >> $HGRCPATH			$ cat << EOF >> $HGRCPATH
	> [rewrite]			> [rewrite]
	> backup-bundle = False			> backup-bundle = False
	> EOF			> EOF
	$ hg rebase -s 5 -d .			$ hg rebase -s 5 -d .
	rebasing 5:1f8148a544ee "b"			rebasing 5:1f8148a544ee "b"
	rebasing 6:f8bc7d28e573 "c"			rebasing 6:f8bc7d28e573 "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 rebase --abort			$ hg rebase --abort
	rebase aborted			rebase aborted
	$ cd ..			$ cd ..

tests/test-rebase-bookmarks.t

	$ 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 "C" (Y Z)
	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 "C" (Y Z)
	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

tests/test-rebase-check-restore.t

	\|/			\|/
	o 0:draft 'A'			o 0:draft 'A'

	$ hg rebase -s 1 -d 4 --keep			$ hg rebase -s 1 -d 4 --keep
	rebasing 1:27547f69f254 "B"			rebasing 1:27547f69f254 "B"
	rebasing 2:965c486023db "C"			rebasing 2:965c486023db "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]

	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)
	\| 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 "F" (tip)
	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)

tests/test-rebase-collapse.t

	> 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)
	> 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
	> 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'
	\| \|			\| \|
	% \| 1: f899f3910ce7 'B'			% \| 1: f899f3910ce7 '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			$ hg rebase --continue
	rebasing 1:f899f3910ce7 "B" (B)			rebasing 1:f899f3910ce7 "B" (B)
	rebasing 3:63668d570d21 "C" (C tip)			rebasing 3:63668d570d21 "C" (C tip)
	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'
	\| \|			\| \|
	o \| 1: f899f3910ce7 'B'			o \| 1: f899f3910ce7 'B'
	\|/			\|/

tests/test-rebase-conflicts.t


	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"			rebasing 4:46f0b057b5c0 "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]

	$ hg status --config commands.status.verbose=1			$ hg status --config commands.status.verbose=1
	M common			M common
	? common.orig			? common.orig
	# The repository is in an unfinished rebase state.			# The repository is in an unfinished rebase state.

	# Unresolved merge conflicts:			# Unresolved merge conflicts:
	$ 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 "abc" (tip)
	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 "abc" (tip)
	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,8 @@			@@ -1,2 +1,8 @@
	a			a
	+<<<<<<< dest: 328e4ab1f7cc ab - test: ab			+<<<<<<< dest: 328e4ab1f7cc ab - test: ab

	$ 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)
	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" (F tip)
	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 6:draft 'C'			o 6:draft 'C'
	\|			\|

tests/test-rebase-dest.t

	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 "dc" (tip)
	merging c			merging c
	warning: conflicts while merging c! (edit, then use 'hg resolve --mark')			warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
	unresolved conflicts (see hg resolve, then hg rebase --continue)			unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
	[1]			[1]
	$ 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 "dc" (tip)
	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

tests/test-rebase-detach.t

	$ 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 "B2" (tip)
	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 "B2" (tip)
	note: not rebasing 3:17b4880d2402 "B2" (tip), its destination already has all its changes			note: not rebasing 3:17b4880d2402 "B2" (tip), its destination already has all its changes
	saved backup bundle to $TESTTMP/a7/.hg/strip-backup/17b4880d2402-1ae1f6cc-rebase.hg			saved backup bundle to $TESTTMP/a7/.hg/strip-backup/17b4880d2402-1ae1f6cc-rebase.hg

tests/test-rebase-inmemory.t

	transaction abort!			transaction abort!
	rollback completed			rollback completed
	hit merge conflicts; re-running rebase without in-memory merge			hit merge conflicts; re-running rebase without in-memory merge
	rebasing 2:177f92b77385 "c"			rebasing 2:177f92b77385 "c"
	rebasing 3:055a42cdd887 "d"			rebasing 3:055a42cdd887 "d"
	rebasing 4:e860deea161a "e"			rebasing 4:e860deea161a "e"
	merging e			merging e
	warning: conflicts while merging e! (edit, then use 'hg resolve --mark')			warning: conflicts while merging e! (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
	saved backup bundle to $TESTTMP/repo3/.hg/strip-backup/c1e524d4287c-f91f82e1-backup.hg			saved backup bundle to $TESTTMP/repo3/.hg/strip-backup/c1e524d4287c-f91f82e1-backup.hg
	rebase aborted			rebase aborted

	Retrying without in-memory merge won't lose working copy changes			Retrying without in-memory merge won't lose working copy changes
	$ cd ..			$ cd ..
	$ hg clone repo3 repo3-dirty -q			$ hg clone repo3 repo3-dirty -q

	$ 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 "add b to foo" (tip)
	merging foo			merging foo
	hit merge conflicts; re-running rebase without in-memory merge			hit merge conflicts; re-running rebase without in-memory merge
	rebasing 2:fb62b706688e "add b to foo" (tip)			rebasing 2:fb62b706688e "add b to foo" (tip)
	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

	Test rebasing when we're in the middle of a rebase already			Test rebasing when we're in the middle of a rebase already
	$ hg init test_issue6214			$ hg init test_issue6214
	$ cd test_issue6214			$ cd test_issue6214
	$ echo r0 > r0			$ echo r0 > r0
	r0			r0
	$ hg rebase -r 2 -d 1 -t:merge3			$ hg rebase -r 2 -d 1 -t:merge3
	rebasing 2:b4d249fbf8dd "bye from foo"			rebasing 2:b4d249fbf8dd "bye from foo"
	merging foo			merging foo
	hit merge conflicts; re-running rebase without in-memory merge			hit merge conflicts; re-running rebase without in-memory merge
	rebasing 2:b4d249fbf8dd "bye from foo"			rebasing 2:b4d249fbf8dd "bye from foo"
	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]
	$ hg rebase -r 3 -d 1 -t:merge3			$ hg rebase -r 3 -d 1 -t:merge3
	abort: rebase in progress			abort: rebase in progress
	(use 'hg rebase --continue' or 'hg rebase --abort')			(use 'hg rebase --continue' or 'hg rebase --abort')
	[255]			[255]
	$ hg resolve --list			$ hg resolve --list
	U foo			U foo
	$ hg resolve --all --re-merge -t:other			$ hg resolve --all --re-merge -t:other

tests/test-rebase-interruptions.t


	Rebasing B onto E:			Rebasing B onto E:

	$ hg rebase -s 1 -d 4			$ hg rebase -s 1 -d 4
	rebasing 1:27547f69f254 "B"			rebasing 1:27547f69f254 "B"
	rebasing 2:965c486023db "C"			rebasing 2:965c486023db "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]

	Force a commit on C during the interruption:			Force a commit on C during the interruption:

	$ hg up -q -C 2 --config 'extensions.rebase=!'			$ hg up -q -C 2 --config 'extensions.rebase=!'

	$ echo 'Extra' > Extra			$ echo 'Extra' > Extra
	$ hg add Extra			$ hg add Extra

	Resume the rebasing:			Resume the rebasing:

	$ hg rebase --continue			$ hg rebase --continue
	already rebased 1:27547f69f254 "B" as 45396c49d53b			already rebased 1:27547f69f254 "B" as 45396c49d53b
	rebasing 2:965c486023db "C"			rebasing 2:965c486023db "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]

	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)

	Rebasing B onto E:			Rebasing B onto E:

	$ hg rebase -s 1 -d 4			$ hg rebase -s 1 -d 4
	rebasing 1:27547f69f254 "B"			rebasing 1:27547f69f254 "B"
	rebasing 2:965c486023db "C"			rebasing 2:965c486023db "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]

	Force a commit on B' during the interruption:			Force a commit on B' during the interruption:

	$ hg up -q -C 5 --config 'extensions.rebase=!'			$ hg up -q -C 5 --config 'extensions.rebase=!'

	$ echo 'Extra' > Extra			$ echo 'Extra' > Extra
	$ hg add Extra			$ hg add Extra

	Rebasing B onto E:			Rebasing B onto E:

	$ hg rebase -s 1 -d 4			$ hg rebase -s 1 -d 4
	rebasing 1:27547f69f254 "B"			rebasing 1:27547f69f254 "B"
	rebasing 2:965c486023db "C"			rebasing 2:965c486023db "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]

	Change phase on B and B'			Change phase on B and B'

	$ hg up -q -C 5 --config 'extensions.rebase=!'			$ hg up -q -C 5 --config 'extensions.rebase=!'
	$ hg phase --public 1			$ hg phase --public 1
	$ hg phase --public 5			$ hg phase --public 5
	$ hg phase --secret -f 2			$ hg phase --secret -f 2
	\|/			\|/
	o 0: 4a2df7238c3b 'A'			o 0: 4a2df7238c3b 'A'

	$ hg rebase -s 1 -d 4			$ hg rebase -s 1 -d 4
	rebasing 1:27547f69f254 "B"			rebasing 1:27547f69f254 "B"
	rebasing 2:965c486023db "C"			rebasing 2:965c486023db "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
	@ 5: 45396c49d53b 'B'			@ 5: 45396c49d53b 'B'
	\|			\|
	o 4: ae36e8e3dfd7 'E'			o 4: ae36e8e3dfd7 'E'
	\|			\|
	o 3: 46b37eabc604 'D'			o 3: 46b37eabc604 'D'
	\|			\|
	$ hg up '.^'			$ hg up '.^'
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ echo c >> a			$ echo c >> a
	$ hg commit -qm c			$ hg commit -qm c
	$ hg rebase -s 1 -d 2 --noninteractive			$ hg rebase -s 1 -d 2 --noninteractive
	rebasing 1:fdaca8533b86 "b"			rebasing 1:fdaca8533b86 "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 1:fdaca8533b86 "b"			rebasing 1:fdaca8533b86 "b"
	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 "b" (tip)
	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 "b" (tip)
	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-mq-skip.t


	$ HGMERGE=internal:fail hg rebase			$ HGMERGE=internal:fail hg rebase
	rebasing 1:b4bffa6e4776 "r1" (qbase r1)			rebasing 1:b4bffa6e4776 "r1" (qbase r1)
	note: not rebasing 1:b4bffa6e4776 "r1" (qbase r1), its destination already has all its changes			note: not rebasing 1:b4bffa6e4776 "r1" (qbase r1), its destination already has all its changes
	rebasing 2:c0fd129beb01 "r2" (r2)			rebasing 2:c0fd129beb01 "r2" (r2)
	rebasing 3:6ff5b8feed8e "r3" (r3)			rebasing 3:6ff5b8feed8e "r3" (r3)
	note: 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 "r1" (qbase r1) as 057f55ff8f44

tests/test-rebase-mq.t

	$ 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 "P0" (f.patch qbase)
	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 "P0" (f.patch qbase)
	rebasing 3:929394423cd3 "P1" (f2.patch qtip tip)			rebasing 3:929394423cd3 "P1" (f2.patch qtip tip)
	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

tests/test-rebase-obsolete.t

	\|/			\|/
	o 16:61bd55f69bc4 bar foo			o 16:61bd55f69bc4 bar foo
	\|			\|
	~			~
	$ hg rebase -r ".^^ + .^ + ." -d 18			$ hg rebase -r ".^^ + .^ + ." -d 18
	rebasing 19:b82fb57ea638 "willconflict second version"			rebasing 19:b82fb57ea638 "willconflict second version"
	merging willconflict			merging willconflict
	warning: conflicts while merging willconflict! (edit, then use 'hg resolve --mark')			warning: conflicts while merging willconflict! (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 --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"

	$ hg update -q $C --hidden			$ hg update -q $C --hidden
	updated to hidden changeset 7829726be4dc			updated to hidden changeset 7829726be4dc
	(hidden revision '7829726be4dc' is pruned)			(hidden revision '7829726be4dc' is pruned)
	$ hg rebase -s $B -d $D			$ hg rebase -s $B -d $D
	rebasing 1:2ec65233581b "B"			rebasing 1:2ec65233581b "B"
	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]

	$ cp -R . $TESTTMP/hidden-state2			$ cp -R . $TESTTMP/hidden-state2

	$ hg log -G			$ hg log -G
	@ 2:b18e25de2cf5 D			@ 2:b18e25de2cf5 D
	\|			\|
	o 0:426bada5c675 A			o 0:426bada5c675 A
	a			a

	$ hg rebase -s 1 -d 5			$ hg rebase -s 1 -d 5
	rebasing 1:d2ae7f538514 "b"			rebasing 1:d2ae7f538514 "b"
	rebasing 2:177f92b77385 "c"			rebasing 2:177f92b77385 "c"
	rebasing 3:055a42cdd887 "d"			rebasing 3:055a42cdd887 "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 -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n"			$ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n"
	o 7:7fffad344617 test			o 7:7fffad344617 test
	\| c			\| c
	\|			\|
	o 6:b15528633407 test			o 6:b15528633407 test
	a			a

	$ hg rebase -s 1 -d 5			$ hg rebase -s 1 -d 5
	rebasing 1:d2ae7f538514 "b"			rebasing 1:d2ae7f538514 "b"
	rebasing 2:177f92b77385 "c"			rebasing 2:177f92b77385 "c"
	rebasing 3:055a42cdd887 "d"			rebasing 3:055a42cdd887 "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
	abort: cannot remove original changesets with unrebased descendants			abort: cannot remove original changesets with unrebased descendants
	(either enable obsmarkers to allow unstable revisions or use --keep to keep original changesets)			(either enable obsmarkers to allow unstable revisions or use --keep to keep original changesets)
	[255]			[255]
	$ hg rebase --abort			$ hg rebase --abort
	saved backup bundle to $TESTTMP/rbstop/.hg/strip-backup/b15528633407-6eb72b6f-backup.hg			saved backup bundle to $TESTTMP/rbstop/.hg/strip-backup/b15528633407-6eb72b6f-backup.hg
	rebase aborted			rebase aborted

	Test --stop when --keep is passed:			Test --stop when --keep is passed:
	==================================			==================================
	$ hg rebase -s 1 -d 5 --keep			$ hg rebase -s 1 -d 5 --keep
	rebasing 1:d2ae7f538514 "b"			rebasing 1:d2ae7f538514 "b"
	rebasing 2:177f92b77385 "c"			rebasing 2:177f92b77385 "c"
	rebasing 3:055a42cdd887 "d"			rebasing 3:055a42cdd887 "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
	$ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n"			$ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n"
	o 7:7fffad344617 test			o 7:7fffad344617 test
	\| c			\| c
	\|			\|
	o 6:b15528633407 test			o 6:b15528633407 test
	\| b			\| b
	a			a

	$ hg rebase -s 1 -d 5 --collapse -m "collapsed b c d"			$ hg rebase -s 1 -d 5 --collapse -m "collapsed b c d"
	rebasing 1:d2ae7f538514 "b"			rebasing 1:d2ae7f538514 "b"
	rebasing 2:177f92b77385 "c"			rebasing 2:177f92b77385 "c"
	rebasing 3:055a42cdd887 "d"			rebasing 3:055a42cdd887 "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
	abort: cannot stop in --collapse session			abort: cannot stop in --collapse session
	[255]			[255]
	$ hg rebase --abort			$ hg rebase --abort
	rebase aborted			rebase aborted
	$ hg diff			$ hg diff
	$ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n"			$ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n"
	a			a

	Test --stop raise errors with conflicting options:			Test --stop raise errors with conflicting options:
	=================================================			=================================================
	$ hg rebase -s 3 -d 5			$ hg rebase -s 3 -d 5
	rebasing 3:055a42cdd887 "d"			rebasing 3:055a42cdd887 "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 --dry-run			$ hg rebase --stop --dry-run
	abort: cannot specify both --stop and --dry-run			abort: cannot specify both --stop and --dry-run
	[255]			[255]

	$ hg rebase -s 3 -d 5			$ hg rebase -s 3 -d 5
	abort: rebase in progress			abort: rebase in progress
	(use 'hg rebase --continue' or 'hg rebase --abort')			(use 'hg rebase --continue' or 'hg rebase --abort')
	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 "B" (X)
	rebasing 2:49cb3485fa0c "C" (Y)			rebasing 2:49cb3485fa0c "C" (Y)
	rebasing 3:67a385d4e6f2 "D" (Z)			rebasing 3:67a385d4e6f2 "D" (Z)
	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
	\|			\|
	o 6: 9b87b54e5fd8 'B' bookmarks: X			o 6: 9b87b54e5fd8 'B' bookmarks: X
	\|			\|

tests/test-rebase-parameters.t

	$ 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 "c2b" (tip)
	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)

tests/test-rebase-partial.t

	> 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
	\|			\|
	\| o 2: ef8c0fe0897b D			\| o 2: ef8c0fe0897b D
	\| \|			\| \|

tests/test-rebase-transaction.t

	> \|/			> \|/
	> 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
	\| \|			\| \|
	% \| 3: C			% \| 3: C
	\| \|			\| \|

tests/test-resolve.t

	$ hg rebase -s 1 -d 2			$ hg rebase -s 1 -d 2
	rebasing 1:f30f98a8181f "added emp1 emp2 emp3"			rebasing 1:f30f98a8181f "added emp1 emp2 emp3"
	merging emp1			merging emp1
	merging emp2			merging emp2
	merging emp3			merging emp3
	warning: conflicts while merging emp1! (edit, then use 'hg resolve --mark')			warning: conflicts while merging emp1! (edit, then use 'hg resolve --mark')
	warning: conflicts while merging emp2! (edit, then use 'hg resolve --mark')			warning: conflicts while merging emp2! (edit, then use 'hg resolve --mark')
	warning: conflicts while merging emp3! (edit, then use 'hg resolve --mark')			warning: conflicts while merging emp3! (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]

	Test when commands.resolve.confirm config option is not set:			Test when commands.resolve.confirm config option is not set:
	===========================================================			===========================================================
	$ hg resolve --all			$ hg resolve --all
	merging emp1			merging emp1
	merging emp2			merging emp2
	merging emp3			merging emp3

tests/test-sparse-profiles.t


	$ hg rebase -d 2			$ hg rebase -d 2
	rebasing 1:a2b1de640a62 "edit profile"			rebasing 1:a2b1de640a62 "edit profile"
	temporarily included 2 file(s) in the sparse checkout for merging			temporarily included 2 file(s) in the sparse checkout for merging
	merging backend.sparse			merging backend.sparse
	merging data.py			merging data.py
	warning: conflicts while merging backend.sparse! (edit, then use 'hg resolve --mark')			warning: conflicts while merging backend.sparse! (edit, then use 'hg resolve --mark')
	warning: conflicts while merging data.py! (edit, then use 'hg resolve --mark')			warning: conflicts while merging data.py! (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 *.orig			$ rm *.orig
	$ ls -A			$ ls -A
	.hg			.hg
	backend.sparse			backend.sparse
	data.py			data.py
	index.html			index.html
	webpage.sparse			webpage.sparse

tests/test-sparse.t


	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 "edit hide" (tip)
	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]
	hide*			hide*

	Temporarily Included Files (for merge/rebase):			Temporarily Included Files (for merge/rebase):
	hide			hide