Mercurial > hg

log tests/test-backout.t @ 46811:5a0b930cfb3e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
Wed, 10 Mar 2021 13:14:32 +0530 Pulkit Goyal commit: get info from mergestate whether a file was merged or not
Tue, 06 Oct 2020 22:36:15 -0700 Martin von Zweigbergk errors: introduce InputError and use it from commands and cmdutil
Thu, 29 Oct 2020 13:54:25 +0100 Dan Villiom Podlaski Christiansen commit: warn the user when a commit already exists
Wed, 28 Oct 2020 17:41:25 +0100 Dan Villiom Podlaski Christiansen backout: don't assume that tip as what we just committed stable
Thu, 15 Oct 2020 21:44:03 -0700 Martin von Zweigbergk backout: leverage cmdutil.check_incompatible_arguments()
Thu, 13 Feb 2020 21:14:20 -0800 Martin von Zweigbergk debugmergestate: make templated
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
Tue, 02 Jul 2019 12:59:58 -0400 Valentin Gatien-Baron commit: improve the files field of changelog for merges
Thu, 20 Sep 2018 21:35:01 -0700 Martin von Zweigbergk debugdirstate: deprecate --nodates in favor of --no-dates
Fri, 31 Aug 2018 23:28:09 +0530 Sushil khanchi revert: fix the inconsistency of status msgs in --interactive mode
Mon, 17 Oct 2016 23:16:55 +0200 Mads Kiilerich spelling: fixes of non-dictionary words
Fri, 05 Feb 2016 10:22:14 -0800 Durham Goode merge: add file ancestor linknode to mergestate
Sat, 30 Jan 2016 18:00:11 +0900 Yuya Nishihara backout: disable --merge with --no-commit (issue4874) stable
Wed, 20 Jan 2016 08:16:58 -0800 Ruslan Sayfutdinov backout: fix --no-commit option (issue5054) stable
Fri, 15 Jan 2016 13:46:33 -0800 Ruslan Sayfutdinov backout: commit changeset by default (BC)
Thu, 24 Dec 2015 19:25:44 +0000 timeless resolve: suggest the next action
Wed, 25 Nov 2015 14:25:26 -0800 Siddharth Agarwal filemerge: add debug output for whether this is a change/delete conflict
Fri, 13 Nov 2015 23:01:36 -0800 Siddharth Agarwal debugmergestate: print out record type for files
Sat, 17 Oct 2015 01:15:34 +0900 FUJIWARA Katsunori merge: make in-memory changes visible to external update hooks
Sat, 17 Oct 2015 01:15:34 +0900 FUJIWARA Katsunori hook: centralize passing HG_PENDING to external hook process
Wed, 07 Oct 2015 00:01:16 -0700 Siddharth Agarwal filemerge: normalize 'internal:foo' names to ':foo'
Fri, 02 Oct 2015 13:00:47 -0700 Siddharth Agarwal commands: add a new debug command to print merge state
Thu, 30 Jul 2015 06:16:12 +0900 FUJIWARA Katsunori localrepo: make journal.dirstate contain in-memory changes before transaction stable
Fri, 29 May 2015 22:23:58 +0200 Gilles Moris summary: move the parents phase marker to commit line (issue4688)
Fri, 22 May 2015 17:08:59 -0500 Matt Mackall branch: don't warn about branches if repository has multiple branches already
Thu, 14 May 2015 17:38:38 +0200 Gilles Moris summary: add a phase line (draft, secret) to the output
Wed, 17 Dec 2014 17:26:12 -0800 Mateusz Kwapich backout: add --commit option
Sat, 26 Jul 2014 03:32:49 +0200 Pierre-Yves David resolve: add parenthesis around "no more unresolved files" message stable
Sun, 01 Jun 2014 00:08:32 +0900 FUJIWARA Katsunori backout: accept '--edit' like other commands creating new changeset
Sun, 11 May 2014 00:49:36 +0900 FUJIWARA Katsunori backout: use "getcommiteditor()" instead of explicit editor choice
Fri, 09 May 2014 14:46:50 -0500 Matt Mackall resolve: simplify "finished" message
Fri, 18 Apr 2014 22:19:25 -0700 Gregory Szorc resolve: print message when no unresolved files remain (issue4214)
Tue, 01 Apr 2014 17:59:06 -0500 Matt Mackall merge with stable
Sat, 08 Mar 2014 18:52:16 +0900 Yuya Nishihara backout: correct commit status of no changes made (BC) (issue4190) stable 2.9.2
Mon, 24 Feb 2014 22:42:14 +0100 Mads Kiilerich backout: improve confusing 'cannot backout change on a different branch' abort
Tue, 25 Feb 2014 18:45:01 -0800 Pierre-Yves David resolve: use "other" changeset from merge state (issue4163) stable
Wed, 08 Jan 2014 17:23:26 -0800 Pierre-Yves David backout: add a message after backout that need manual commit
Wed, 08 Jan 2014 14:53:46 -0800 Pierre-Yves David backout: avoid update on simple case.
Wed, 08 Jan 2014 17:15:22 -0800 Pierre-Yves David test-backout: add multiple summary calls to monitor result wc
Mon, 11 Jun 2012 01:38:32 +0200 Mads Kiilerich tests: cleanup of tests that got lost in their own nested directories
Thu, 08 Dec 2011 16:01:44 -0600 Matt Mackall merge with stable
Thu, 08 Dec 2011 14:32:44 -0600 Matt Mackall branch: warn on branching stable
Wed, 16 Nov 2011 03:45:14 +0100 Mads Kiilerich tests: remove hacks for testing if file or directory exists
Sat, 08 Oct 2011 14:18:18 -0500 Matt Mackall backout: deprecate/hide support for backing out merges
Thu, 10 Feb 2011 09:03:06 +0100 Gilles Moris rollback: clarifies the message about the reverted state (issue2628) stable
Fri, 22 Oct 2010 11:58:43 -0500 Steve Borho backout: add --tool argument for specifying merge tool stable
Fri, 10 Sep 2010 10:28:18 +0200 Gilles Moris backout: provide linear backout as a default (without --merge option)
Fri, 17 Sep 2010 17:03:08 -0500 Matt Mackall tests: fix a bunch of pointless #s in unified tests
Fri, 17 Sep 2010 17:03:04 -0500 Matt Mackall tests: exit 0 no longer needed on unified tests
Thu, 16 Sep 2010 17:51:32 -0500 Matt Mackall tests: add exit codes to unified tests
Sat, 14 Aug 2010 02:28:53 +0200 Martin Geisler tests: unify test-backout base tests/test-backout@7eb6424d34cc
less more | (0) tip