This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	lothiraldan	D3694 shelve: use more accurate description in conflict marker
Closed	lothiraldan	D3693 shelve: directly handle the initial parent alignment
Closed	lothiraldan	D3692 merge: add a 'keepconflictparent' argument to graft
Closed	lothiraldan	D3691 shelve: stop testing missing rebase state file
Closed	lothiraldan	D3690 shelve: actually test corrupted shelve state
Closed	lothiraldan	D3689 shelve: directly handle `--continue`
Closed	lothiraldan	D3688 shelve: directly handle the abort process
Closed	lothiraldan	D3687 shelve: check the actual shelvestate in morestatus
Closed	lothiraldan	D3686 shelve: wider check for successful abort in test
Closed	lothiraldan	D3685 shelve: use full hash in tests

Diff 8979

	$ echo '' > root			$ echo '' > root
	$ hg shelve -q			$ hg shelve -q
	$ echo 'contADDent' > root			$ echo 'contADDent' > root
	$ hg unshelve -q			$ hg unshelve -q
	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 unshelve --continue')			unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
	[1]			[1]
	$ sed 's/ae8c668541e8/123456789012/' .hg/shelvedstate > ../corrupt-shelvedstate			$ sed 's/ae8c668541e8/123456789012/' .hg/shelvedstate > ../corrupt-shelvedstate
	$ mv ../corrupt-shelvedstate .hg/histedit-state			$ mv ../corrupt-shelvedstate .hg/shelvestate
	$ hg unshelve --abort 2>&1 \| grep 'aborted'			$ hg unshelve --abort 2>&1 \| grep 'aborted'
	unshelve of 'default-01' aborted			unshelve of 'default-01' aborted
	$ hg summary			$ hg summary
	parent: 0:ae8c668541e8 tip			parent: 0:ae8c668541e8 tip
	root			root
	branch: default			branch: default
	commit: 1 modified, 1 unknown			commit: 1 modified, 1 unknown
	update: (current)			update: (current)