Mercurial > hg

log tests/test-update-branches.t @ 48326:141e38ef8d8f stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
Fri, 29 Jan 2021 15:56:08 -0800 Martin von Zweigbergk errors: use StateError more in merge module
Mon, 23 Nov 2020 16:48:13 -0800 Martin von Zweigbergk errors: raise StateError when there are unresolves merge conflicts
Mon, 23 Nov 2020 10:42:03 -0800 Martin von Zweigbergk errors: raise InputError on bad repo arguments
Mon, 23 Nov 2020 11:18:48 -0800 Martin von Zweigbergk errors: remove trailing "!" from some error messages for consistency
Mon, 12 Oct 2020 12:44:18 -0700 Martin von Zweigbergk errors: introduce StateError and use it from commands and cmdutil
Fri, 28 Feb 2020 11:32:02 -0800 Martin von Zweigbergk commit: clear resolved mergestate even if working copy is clean
Mon, 02 Mar 2020 15:34:51 -0500 Valentin Gatien-Baron update: simplify slightly
Fri, 28 Feb 2020 10:30:18 -0800 Martin von Zweigbergk commit: error out on unresolved files even if commit would be empty
Fri, 28 Feb 2020 10:49:13 -0800 Martin von Zweigbergk tests: add test of committing with conflicts but no changes in wdir
Tue, 28 Jan 2020 21:49:50 -0800 Martin von Zweigbergk graphlog: use '%' for other context in merge conflict
Wed, 29 Jan 2020 14:42:54 -0800 Martin von Zweigbergk tests: add `hg log -G` output when there are merge conflicts
Wed, 18 Dec 2019 23:45:11 -0800 Rodrigo Damazio Bovendorp status: make unresolved files always be in the morestatus structured output
Wed, 18 Dec 2019 23:43:21 -0800 Rodrigo Damazio Bovendorp status: make morestatus call out unresolved conflicts after update
Fri, 13 Dec 2019 18:59:26 -0800 Rodrigo Damazio Bovendorp update: add some tests for the status quo of morestatus on update conflicts
Sun, 14 Oct 2018 13:19:24 +0200 Pierre-Yves David debugobsolete: also issue the "new obsmarkers" messsage
Mon, 07 May 2018 19:43:43 -0700 Martin von Zweigbergk update: print warning about hidden changeset after update
Tue, 16 Jan 2018 14:08:54 +0100 Boris Feld update: display the obsfate of hidden revision we update to
Wed, 27 Dec 2017 00:14:00 +0530 Pulkit Goyal update: support updating to hidden cset if directaccess config is set
Mon, 23 Oct 2017 22:45:24 +0200 muxator commands: be more uniform in an "hg update" error message stable
Thu, 28 Sep 2017 18:19:06 +0100 Boris Feld config: use 'experimental.evolution.create-markers'
Sat, 14 Oct 2017 03:13:50 -0400 Augie Fackler config: graduate experimental.updatecheck to commands.update.check
Fri, 04 Aug 2017 18:41:16 +0200 Boris Feld test: update evolution config
Sun, 16 Jul 2017 02:33:14 +0200 Boris Feld debugobsolete: also report the number of obsoleted changesets
Sun, 09 Jul 2017 16:13:30 -0400 Matt Harbison subrepo: make the output references to subrepositories consistent
Tue, 06 Jun 2017 22:17:39 +0530 Pulkit Goyal update: show the commit to which we updated in case of multiple heads (BC)
Mon, 06 Mar 2017 23:21:27 -0800 Martin von Zweigbergk update: for "noconflict" updates, print "conflicting changes" on conflict
Mon, 06 Mar 2017 23:19:57 -0800 Martin von Zweigbergk tests: fix test-update-branches to remove non-conflicting file
Mon, 13 Feb 2017 00:05:55 -0800 Martin von Zweigbergk update: allow setting default update check to "noconflict"
Mon, 13 Feb 2017 16:03:05 -0800 Martin von Zweigbergk update: add experimental config for default way of handling dirty wdir
Mon, 13 Feb 2017 12:58:37 -0800 Martin von Zweigbergk update: accept --merge to allow merging across topo branches (issue5125)
Wed, 08 Feb 2017 22:12:27 -0800 Martin von Zweigbergk tests: add test for updating to null revision
Fri, 02 Sep 2016 21:49:33 +0000 timeless update: use single quotes in use warning
Tue, 13 Sep 2016 22:57:57 -0400 Augie Fackler flags: allow specifying --no-boolean-flag on the command line (BC)
Tue, 29 Mar 2016 23:59:32 +0900 FUJIWARA Katsunori destutil: make messages at updating to the closed head usual form
Mon, 07 Mar 2016 03:14:19 +0900 FUJIWARA Katsunori destutil: choose non-closed branch head at first (BC)
Wed, 24 Feb 2016 23:00:33 +0900 FUJIWARA Katsunori destutil: show message about other branch heads, even if on a closed head
Tue, 02 Feb 2016 15:24:11 +0000 Pierre-Yves David update: change default destination to tipmost descendant (issue4673) (BC)
Tue, 02 Feb 2016 14:49:02 +0000 Pierre-Yves David update: warn about other topological heads on bare update
Thu, 15 Oct 2015 01:35:44 +0100 Pierre-Yves David revset: reintroduce and experimental revset for update destination
Wed, 25 Mar 2015 13:55:35 +0900 FUJIWARA Katsunori update: replace workingctx.dirty and raising Abort by cmdutil.bailifchanged
Tue, 14 Oct 2014 13:34:25 -0700 Durham Goode obsolete: update tests to use obsolete options
Wed, 15 Jan 2014 17:48:48 -0600 Sean Farley update: consider successor changesets when moving active bookmark
Wed, 15 Jan 2014 16:41:18 -0600 Sean Farley merge: consider successor changesets for a bare update
Fri, 22 Nov 2013 19:14:17 +0100 Martin Geisler tests: don't load unnecessary graphlog extension
Wed, 06 Nov 2013 19:01:14 -0600 Sean Farley bookmarks: consider successor changesets when moving bookmark (issue4015) stable
Mon, 23 Sep 2013 20:33:02 -0700 Siddharth Agarwal update: standardize error message for dirty update --check
Mon, 23 Sep 2013 20:08:52 -0700 Siddharth Agarwal update: improve error message for dirty non-linear update with rev
Mon, 23 Sep 2013 20:07:30 -0700 Siddharth Agarwal update: add error message for dirty non-linear update with no rev
Mon, 23 Sep 2013 17:43:33 -0700 Siddharth Agarwal update: improve error message for clean non-linear update
Tue, 16 Apr 2013 15:33:18 +0200 Pierre-Yves David update: allow dirty update to foreground (successors)
Tue, 16 Oct 2012 11:43:15 -0700 Siddharth Agarwal commands: don't infer repo for commands like update (issue2748)
Wed, 08 Aug 2012 18:10:37 +0200 Mads Kiilerich check-code: fix check for trailing whitespace on continued lines too
Mon, 23 Apr 2012 12:12:04 +0200 Patrick Mezard update: make --check abort with dirty subrepos stable
Tue, 31 May 2011 11:52:22 -0700 Brendan Cully Make pull -u behave like pull && update
Sat, 09 Oct 2010 17:02:28 -0500 Brodie Rao update: use higher level wording for "crosses branches" error
Fri, 17 Sep 2010 17:03:08 -0500 Matt Mackall tests: fix a bunch of pointless #s in unified tests
Tue, 14 Sep 2010 12:20:51 +0200 Adrian Buehlmann combine tests base tests/test-update-branches@bb2dc5ec7fc4
less more | (0) tip