This is an archive of the discontinued Mercurial Phabricator instance.

In D9509#142943, @mharbison72 wrote:

Queued, thanks. I got a fuzz 1 (offset 0 lines) message when I applied the first one, so please double check it.

Looks good, thanks.

baymax added a child revision: D9503: copies: avoid materializing a full directory map during copy tracing.Dec 3 2020, 6:15 AM

martinvonz added a commit: rHG1d5189a57405: rebase: clear merge state when aborting in-memory merge on dirty working copy.Dec 3 2020, 9:53 AM

Revision Contents
Changeset List

			Path	Packages
M			hgext/rebase.py (7 lines)
M			tests/test-rebase-inmemory.t (6 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	23979		Dec 2 2020, 6:46 PM	★	★
Diff 2	23983	rHG61c1f29e7f4f26dca94e831d2ba7c3ff81c0faeb	Dec 2 2020, 6:39 PM	★	★
Diff 3	23987		Dec 3 2020, 2:37 AM	★	★

Status	Author	Revision
Closed	spectral	D9511 statprof: separate functions and "line", assume 4 digit line numbers
Closed	spectral	D9510 statprof: fix off-by-one-line error in output
Closed	marmoute	D9513 phab-refresh: do not error out when the stack is empty
Closed	marmoute	D9507 run-tests: allow some slack about 'waiting on lock' message
Closed	marmoute	D9506 pull: flush stdin after the `pull from` message
Closed	marmoute	D9505 tests: explicitly skip the lock warning in some remotefilelog tests
Closed	marmoute	D9504 tests: use the right python when running dummyssh for narrow
Closed	spectral	D9503 copies: avoid materializing a full directory map during copy tracing
Closed	martinvonz	D9509 rebase: clear merge state when aborting in-memory merge on dirty working copy
Closed	martinvonz	D9508 tests: show that in-memory rebase leaves state when working copy is dirty

Diff 23983

hgext/rebase.py

	# so the entire rebase operation is retried.			# so the entire rebase operation is retried.
	raise			raise
	ui.status(			ui.status(
	_(			_(
	b"hit merge conflicts; rebasing that "			b"hit merge conflicts; rebasing that "
	b"commit again in the working copy\n"			b"commit again in the working copy\n"
	)			)
	)			)
				try:
	cmdutil.bailifchanged(repo)			cmdutil.bailifchanged(repo)
				except error.Abort:
				clearstatus(repo)
				clearcollapsemsg(repo)
				raise
	self.inmemory = False			self.inmemory = False
	self._assignworkingcopy()			self._assignworkingcopy()
	mergemod.update(repo[p1], wc=self.wctx)			mergemod.update(repo[p1], wc=self.wctx)
	rebasenode(			rebasenode(
	repo,			repo,
	rev,			rev,
	p1,			p1,
	p2,			p2,

tests/test-rebase-inmemory.t

	transaction abort!			transaction abort!
	rollback completed			rollback completed
	abort: uncommitted changes			abort: uncommitted changes
	[20]			[20]
	$ cat a			$ cat a
	dirty			dirty
	$ hg status -v			$ hg status -v
	M a			M a
	# The repository is in an unfinished rebase state.

	# To continue: hg rebase --continue
	# To abort: hg rebase --abort
	# To stop: hg rebase --stop


	Retrying without in-memory merge won't lose merge state			Retrying without in-memory merge won't lose merge state
	$ cd ..			$ cd ..
	$ hg clone repo3 repo3-merge-state -q			$ hg clone repo3 repo3-merge-state -q
	$ cd repo3-merge-state			$ cd repo3-merge-state
	$ hg merge 4			$ hg merge 4
	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')

This is an archive of the discontinued Mercurial Phabricator instance.

rebase: clear merge state when aborting in-memory merge on dirty working copyClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 23983

hgext/rebase.py

tests/test-rebase-inmemory.t

rebase: clear merge state when aborting in-memory merge on dirty working copy
ClosedPublic

Revision Contents
Changeset List