| Tue, 18 Jan 2022 13:23:49 -0800 |
Martin von Zweigbergk |
update: set custom conflict label for base commit
|
file |
diff |
annotate
|
| Thu, 20 Jan 2022 14:13:12 -0800 |
Martin von Zweigbergk |
filemerge: always define a "base" label
|
file |
diff |
annotate
|
| Fri, 03 Dec 2021 12:03:23 +0100 |
Pierre-Yves David |
update: properly overwrite `check` config with `--no-` variants
|
file |
diff |
annotate
|
| Fri, 03 Dec 2021 12:19:36 +0100 |
Pierre-Yves David |
update: add a test for `--merge` overriding the "abort" config
|
file |
diff |
annotate
|
| Fri, 03 Dec 2021 12:01:00 +0100 |
Pierre-Yves David |
update: use long version of the flag in the test
|
file |
diff |
annotate
|
| Fri, 29 Jan 2021 15:56:08 -0800 |
Martin von Zweigbergk |
errors: use StateError more in merge module
|
file |
diff |
annotate
|
| 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
|
| Tue, 16 Jan 2018 14:08:54 +0100 |
Boris Feld |
update: display the obsfate of hidden revision we update to
|
file |
diff |
annotate
|
| Wed, 27 Dec 2017 00:14:00 +0530 |
Pulkit Goyal |
update: support updating to hidden cset if directaccess config is set
|
file |
diff |
annotate
|
| Mon, 23 Oct 2017 22:45:24 +0200 |
muxator |
commands: be more uniform in an "hg update" error message
stable
|
file |
diff |
annotate
|
| Thu, 28 Sep 2017 18:19:06 +0100 |
Boris Feld |
config: use 'experimental.evolution.create-markers'
|
file |
diff |
annotate
|
| Sat, 14 Oct 2017 03:13:50 -0400 |
Augie Fackler |
config: graduate experimental.updatecheck to commands.update.check
|
file |
diff |
annotate
|
| Fri, 04 Aug 2017 18:41:16 +0200 |
Boris Feld |
test: update evolution config
|
file |
diff |
annotate
|
| Sun, 16 Jul 2017 02:33:14 +0200 |
Boris Feld |
debugobsolete: also report the number of obsoleted changesets
|
file |
diff |
annotate
|
| Sun, 09 Jul 2017 16:13:30 -0400 |
Matt Harbison |
subrepo: make the output references to subrepositories consistent
|
file |
diff |
annotate
|
| Tue, 06 Jun 2017 22:17:39 +0530 |
Pulkit Goyal |
update: show the commit to which we updated in case of multiple heads (BC)
|
file |
diff |
annotate
|
| Mon, 06 Mar 2017 23:21:27 -0800 |
Martin von Zweigbergk |
update: for "noconflict" updates, print "conflicting changes" on conflict
|
file |
diff |
annotate
|
| Mon, 06 Mar 2017 23:19:57 -0800 |
Martin von Zweigbergk |
tests: fix test-update-branches to remove non-conflicting file
|
file |
diff |
annotate
|
| Mon, 13 Feb 2017 00:05:55 -0800 |
Martin von Zweigbergk |
update: allow setting default update check to "noconflict"
|
file |
diff |
annotate
|
| Mon, 13 Feb 2017 16:03:05 -0800 |
Martin von Zweigbergk |
update: add experimental config for default way of handling dirty wdir
|
file |
diff |
annotate
|
| Mon, 13 Feb 2017 12:58:37 -0800 |
Martin von Zweigbergk |
update: accept --merge to allow merging across topo branches (issue5125)
|
file |
diff |
annotate
|
| Wed, 08 Feb 2017 22:12:27 -0800 |
Martin von Zweigbergk |
tests: add test for updating to null revision
|
file |
diff |
annotate
|
| Fri, 02 Sep 2016 21:49:33 +0000 |
timeless |
update: use single quotes in use warning
|
file |
diff |
annotate
|
| Tue, 13 Sep 2016 22:57:57 -0400 |
Augie Fackler |
flags: allow specifying --no-boolean-flag on the command line (BC)
|
file |
diff |
annotate
|
| Tue, 29 Mar 2016 23:59:32 +0900 |
FUJIWARA Katsunori |
destutil: make messages at updating to the closed head usual form
|
file |
diff |
annotate
|
| Mon, 07 Mar 2016 03:14:19 +0900 |
FUJIWARA Katsunori |
destutil: choose non-closed branch head at first (BC)
|
file |
diff |
annotate
|
| Wed, 24 Feb 2016 23:00:33 +0900 |
FUJIWARA Katsunori |
destutil: show message about other branch heads, even if on a closed head
|
file |
diff |
annotate
|
| Tue, 02 Feb 2016 15:24:11 +0000 |
Pierre-Yves David |
update: change default destination to tipmost descendant (issue4673) (BC)
|
file |
diff |
annotate
|
| Tue, 02 Feb 2016 14:49:02 +0000 |
Pierre-Yves David |
update: warn about other topological heads on bare update
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 01:35:44 +0100 |
Pierre-Yves David |
revset: reintroduce and experimental revset for update destination
|
file |
diff |
annotate
|
| Wed, 25 Mar 2015 13:55:35 +0900 |
FUJIWARA Katsunori |
update: replace workingctx.dirty and raising Abort by cmdutil.bailifchanged
|
file |
diff |
annotate
|
| Tue, 14 Oct 2014 13:34:25 -0700 |
Durham Goode |
obsolete: update tests to use obsolete options
|
file |
diff |
annotate
|
| Wed, 15 Jan 2014 17:48:48 -0600 |
Sean Farley |
update: consider successor changesets when moving active bookmark
|
file |
diff |
annotate
|
| Wed, 15 Jan 2014 16:41:18 -0600 |
Sean Farley |
merge: consider successor changesets for a bare update
|
file |
diff |
annotate
|
| Fri, 22 Nov 2013 19:14:17 +0100 |
Martin Geisler |
tests: don't load unnecessary graphlog extension
|
file |
diff |
annotate
|
| Wed, 06 Nov 2013 19:01:14 -0600 |
Sean Farley |
bookmarks: consider successor changesets when moving bookmark (issue4015)
stable
|
file |
diff |
annotate
|
| Mon, 23 Sep 2013 20:33:02 -0700 |
Siddharth Agarwal |
update: standardize error message for dirty update --check
|
file |
diff |
annotate
|
| Mon, 23 Sep 2013 20:08:52 -0700 |
Siddharth Agarwal |
update: improve error message for dirty non-linear update with rev
|
file |
diff |
annotate
|
| Mon, 23 Sep 2013 20:07:30 -0700 |
Siddharth Agarwal |
update: add error message for dirty non-linear update with no rev
|
file |
diff |
annotate
|
| Mon, 23 Sep 2013 17:43:33 -0700 |
Siddharth Agarwal |
update: improve error message for clean non-linear update
|
file |
diff |
annotate
|
| Tue, 16 Apr 2013 15:33:18 +0200 |
Pierre-Yves David |
update: allow dirty update to foreground (successors)
|
file |
diff |
annotate
|
| Tue, 16 Oct 2012 11:43:15 -0700 |
Siddharth Agarwal |
commands: don't infer repo for commands like update (issue2748)
|
file |
diff |
annotate
|
| Wed, 08 Aug 2012 18:10:37 +0200 |
Mads Kiilerich |
check-code: fix check for trailing whitespace on continued lines too
|
file |
diff |
annotate
|
| Mon, 23 Apr 2012 12:12:04 +0200 |
Patrick Mezard |
update: make --check abort with dirty subrepos
stable
|
file |
diff |
annotate
|
| Tue, 31 May 2011 11:52:22 -0700 |
Brendan Cully |
Make pull -u behave like pull && update
|
file |
diff |
annotate
|
| Sat, 09 Oct 2010 17:02:28 -0500 |
Brodie Rao |
update: use higher level wording for "crosses branches" error
|
file |
diff |
annotate
|