log tests/test-update-branches.t @ 45657:4a146cff76fa stable

age author description
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)