Changeset View

Standalone View

Show First 20 Lines • Show All 791 Lines • ▼ Show 20 Line(s)	Test rebasing when the file we are merging in destination is empty
-a		-a
+b		+b
$ hg ci -m "remove the whitespace again"		$ hg ci -m "remove the whitespace again"
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:4c5d7dae8fbb "remove the whitespace again" (tip)		rebasing 2:4c5d7dae8fbb "remove the whitespace again" (tip)
merging foo		merging foo
abort: foo.orig@1ed8791587a6: not found in manifest!		hit merge conflicts; re-running rebase without in-memory merge
[255]		rebasing 2:4c5d7dae8fbb "remove the whitespace again" (tip)
		merging foo
		warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
		unresolved conflicts (see hg resolve, then hg rebase --continue)
		[1]