Mon, 23 Nov 2020 16:48:13 -0800 |
Martin von Zweigbergk |
errors: raise StateError when there are unresolves merge conflicts
|
file |
diff |
annotate
|
Mon, 23 Nov 2020 10:42:03 -0800 |
Martin von Zweigbergk |
errors: raise InputError on bad repo arguments
|
file |
diff |
annotate
|
Mon, 23 Nov 2020 11:18:48 -0800 |
Martin von Zweigbergk |
errors: remove trailing "!" from some error messages for consistency
|
file |
diff |
annotate
|
Mon, 12 Oct 2020 12:44:18 -0700 |
Martin von Zweigbergk |
errors: introduce StateError and use it from commands and cmdutil
|
file |
diff |
annotate
|
Fri, 28 Feb 2020 11:32:02 -0800 |
Martin von Zweigbergk |
commit: clear resolved mergestate even if working copy is clean
|
file |
diff |
annotate
|
Mon, 02 Mar 2020 15:34:51 -0500 |
Valentin Gatien-Baron |
update: simplify slightly
|
file |
diff |
annotate
|
Fri, 28 Feb 2020 10:30:18 -0800 |
Martin von Zweigbergk |
commit: error out on unresolved files even if commit would be empty
|
file |
diff |
annotate
|
Fri, 28 Feb 2020 10:49:13 -0800 |
Martin von Zweigbergk |
tests: add test of committing with conflicts but no changes in wdir
|
file |
diff |
annotate
|
Tue, 28 Jan 2020 21:49:50 -0800 |
Martin von Zweigbergk |
graphlog: use '%' for other context in merge conflict
|
file |
diff |
annotate
|
Wed, 29 Jan 2020 14:42:54 -0800 |
Martin von Zweigbergk |
tests: add `hg log -G` output when there are merge conflicts
|
file |
diff |
annotate
|
Wed, 18 Dec 2019 23:45:11 -0800 |
Rodrigo Damazio Bovendorp |
status: make unresolved files always be in the morestatus structured output
|
file |
diff |
annotate
|
Wed, 18 Dec 2019 23:43:21 -0800 |
Rodrigo Damazio Bovendorp |
status: make morestatus call out unresolved conflicts after update
|
file |
diff |
annotate
|
Fri, 13 Dec 2019 18:59:26 -0800 |
Rodrigo Damazio Bovendorp |
update: add some tests for the status quo of morestatus on update conflicts
|
file |
diff |
annotate
|
Sun, 14 Oct 2018 13:19:24 +0200 |
Pierre-Yves David |
debugobsolete: also issue the "new obsmarkers" messsage
|
file |
diff |
annotate
|
Mon, 07 May 2018 19:43:43 -0700 |
Martin von Zweigbergk |
update: print warning about hidden changeset after update
|
file |
diff |
annotate
|