Mercurial > evolve

log tests/test-stabilize-result.t @ 4316:e6ee830c4f45 mercurial-4.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
Mon, 24 Dec 2018 17:47:40 +0100 Pierre-Yves David test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3
Mon, 24 Dec 2018 17:47:31 +0100 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Mon, 24 Dec 2018 17:47:28 +0100 Pierre-Yves David test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
Fri, 21 Dec 2018 13:14:59 +0800 Pierre-Yves David evolve: detect unresolved conflict during evolve --continue (issue5966) stable
Mon, 03 Sep 2018 22:09:26 +0200 Pierre-Yves David test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3
Mon, 03 Sep 2018 22:06:12 +0200 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Mon, 03 Sep 2018 21:59:24 +0200 Pierre-Yves David test-compat: merge stable into mercurial-4.6 mercurial-4.6
Fri, 31 Aug 2018 09:21:19 +0200 Pierre-Yves David pick: replace `hg grab` invocation in test with `hg pick`
Fri, 31 Aug 2018 09:13:11 +0200 Pierre-Yves David pick: update command output to mention pick instead of grab
Fri, 03 Aug 2018 00:22:50 +0200 Pierre-Yves David test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3
Thu, 02 Aug 2018 02:47:44 +0200 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Tue, 31 Jul 2018 11:45:01 +0200 Pierre-Yves David test-compat: backout change to 1e103c7f7663 mercurial-4.6
Fri, 15 Jun 2018 00:16:29 +0530 Pulkit Goyal evolve: raise error.InterventionRequired instead of Abort when conflicts
Wed, 13 Jun 2018 17:15:10 +0530 Pulkit Goyal evolve: create a new commit instead of amending one of the divergents
Tue, 12 Jun 2018 19:00:12 +0530 Pulkit Goyal evolve: improve error messages when conflicts occur
Tue, 12 Jun 2018 04:01:19 +0530 Pulkit Goyal evolve: point to `hg help evolve.interrupted` while resolving content-div
Mon, 11 Jun 2018 01:12:12 +0530 Pulkit Goyal evolve: rename help topic evolve.interrupted-evolve to evolve.interrupted
Wed, 06 Jun 2018 04:09:49 +0530 Pulkit Goyal evolve: show `hg help evolve.interrupted-evolve` in error when conflicts
Tue, 05 Jun 2018 00:53:21 +0530 Pulkit Goyal evolve: use cmdrewrite.amend() instead of creating a new commit
Mon, 23 Apr 2018 14:48:53 +0530 Pulkit Goyal evolve: create new commit while resolving content-divergence
Tue, 22 May 2018 20:33:42 +0530 Pulkit Goyal content-divergence: store the resolved revs in evolvestate['replacements']
Mon, 21 May 2018 14:56:51 +0200 Boris Feld test: update to new outputs
Sun, 29 Apr 2018 19:18:54 +0530 Pulkit Goyal evolve: show cset hash in "merging conetnt-divergent changeset"
Sun, 29 Apr 2018 19:14:41 +0530 Pulkit Goyal evolve: show cset hash in "update to local conflict" message
Sun, 29 Apr 2018 19:11:29 +0530 Pulkit Goyal evolve: use hg.updaterepo() instead of hg.update() to hide stats
Sun, 29 Apr 2018 19:04:18 +0530 Pulkit Goyal evolve: fix the conflicts error message during content-divergence resolution
Sun, 29 Apr 2018 18:51:56 +0530 Pulkit Goyal evolve: add logic to continue interrupted content-divergence resolution
Wed, 25 Apr 2018 01:58:45 +0100 Pierre-Yves David testcompat: update output for Mercurial 4.3 mercurial-4.3
Mon, 23 Apr 2018 12:23:00 +0200 Pierre-Yves David test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3
Mon, 23 Apr 2018 12:11:10 +0200 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Sun, 22 Apr 2018 11:40:17 +0200 Pierre-Yves David evolve: point to '--abort' in error message
Wed, 28 Mar 2018 14:11:13 +0530 Pulkit Goyal evolve: show a message when evolution leads to no changes to commit
Fri, 23 Mar 2018 17:46:46 +0530 Pulkit Goyal evolve: use the new rebased changeset to resolve phase-divergence
Fri, 23 Mar 2018 17:20:20 +0530 Pulkit Goyal tests: add one more test case about handling of phase-divergence by evolve
Wed, 21 Mar 2018 16:32:54 +0100 Pierre-Yves David test-compat: merge mercurial-4.3 into mercurial-4.2 mercurial-4.2
Wed, 21 Mar 2018 16:18:31 +0100 Pierre-Yves David test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3
Wed, 21 Mar 2018 16:06:17 +0100 Pierre-Yves David test-compat: merge stable into mercurial-4.4 mercurial-4.4
Mon, 12 Mar 2018 15:40:28 -0700 Martin von Zweigbergk evolve: include "operation" metadata in obsmarkers
Mon, 12 Mar 2018 23:26:25 -0700 Martin von Zweigbergk tests: do not glob out fixed dates
Mon, 29 Jan 2018 00:09:44 +0530 Pulkit Goyal evolve: show the updated working directory after `hg evolve --continue`
Sat, 27 Jan 2018 21:15:27 +0530 Pulkit Goyal evolve: add evolve info to cmdutil.afterresolvedstates
Thu, 11 Jan 2018 20:03:20 +0530 Pulkit Goyal grab: add a command to grab a commit and update to it
Sat, 20 Jan 2018 11:59:36 +0100 Pierre-Yves David test: update with new 'update' hint about obsfate
Tue, 16 Jan 2018 04:35:34 +0100 Pierre-Yves David test-compat: merge stable into mercurial-4.3 mercurial-4.3
Tue, 16 Jan 2018 04:32:43 +0100 Pierre-Yves David branching: merge stable back into default
Mon, 15 Jan 2018 19:52:00 +0100 Pierre-Yves David branching: backed out test output changes from core-1905aac253f0 stable
Mon, 15 Jan 2018 19:42:44 +0100 Pierre-Yves David branching: backed out test output changes from core-02fdb8c018aa stable
Sat, 06 Jan 2018 18:48:15 +0530 Pulkit Goyal evolve: don't use graftstate for continuing `hg evolve`
Fri, 05 Jan 2018 17:15:43 +0530 Pulkit Goyal evolve: use new trouble names in commit messages
Sat, 09 Dec 2017 08:19:07 +0530 Pulkit Goyal evolve: use compat.TROUBLES to show troubles in user interface
Fri, 05 Jan 2018 09:51:07 +0100 Boris Feld test: update output to 02fdb8c018aa
Fri, 05 Jan 2018 09:23:09 +0100 Boris Feld test: update output to 9b3f95d9783d
Wed, 01 Nov 2017 23:57:56 +0100 Pierre-Yves David test-compat: merge stable into mercurial-4.3 mercurial-4.3
Thu, 26 Oct 2017 09:03:48 +0200 Pierre-Yves David evolve: rename --phasedivergent flag to --phase-divergent
Thu, 26 Oct 2017 09:02:25 +0200 Pierre-Yves David evolve: rename --contentdivergent flag to --content-divergent
Fri, 20 Oct 2017 18:44:52 +0200 Pierre-Yves David test-compat: merge with mercurial-4.0 branch mercurial-3.9
Fri, 20 Oct 2017 20:04:13 +0200 Pierre-Yves David test-compat: revert output changes from phase renaming mercurial-4.3
Fri, 20 Oct 2017 19:32:18 +0200 Pierre-Yves David test-compat: revert output changes related to temporary amend commit mercurial-4.3
Wed, 27 Sep 2017 16:26:30 +0200 Pierre-Yves David packaging: merge stable back into default
Wed, 27 Sep 2017 01:22:58 +0200 Pierre-Yves David compat-test: merge future 6.7.0 into 3.9 compat branch mercurial-3.9
Wed, 27 Sep 2017 00:54:28 +0200 Pierre-Yves David branching: merge future 6.7.0 in the stable branch stable
Fri, 15 Sep 2017 15:48:18 +0200 Boris Feld tests: update after removing of redundant amend commit
Thu, 24 Aug 2017 10:57:32 -0700 Martin von Zweigbergk messages: use hyphenated '{phase,content}-divergent' in user messages
Thu, 24 Aug 2017 09:12:09 +0200 Boris Feld warning: rename warning message
Thu, 24 Aug 2017 09:11:54 +0200 Boris Feld warning: rename bumped warning message
Thu, 24 Aug 2017 09:11:06 +0200 Boris Feld warning: rename unstable warning message
Fri, 11 Aug 2017 11:30:34 +0200 Boris Feld revset: divergent() is deprecated
Fri, 11 Aug 2017 11:23:37 +0200 Boris Feld revset: unstable() is deprecated
Thu, 10 Aug 2017 19:31:55 +0200 Boris Feld log: bumped was renamed into phasedivergent
Thu, 10 Aug 2017 17:57:50 +0200 Boris Feld log: divergent was renamed into contentdivergent
Thu, 10 Aug 2017 17:37:31 +0200 Boris Feld log: unstable was renamed into orphan
Tue, 25 Jul 2017 04:01:10 +0200 Pierre-Yves David test-compat: merge with mercurial-4.0 mercurial-3.9
Mon, 24 Jul 2017 04:41:31 +0200 Pierre-Yves David test: remove reference to the graphlog extension
Fri, 16 Jun 2017 11:54:01 +0200 Boris Feld test-compat: merge with mercurial-4.0 branch mercurial-3.9
Thu, 15 Jun 2017 16:29:51 +0200 Pierre-Yves David test: drop now useless config about effect flag
Sun, 04 Jun 2017 20:47:04 +0200 Boris Feld effectflag: activate effect flag on test-stabilize-result.t test file
Wed, 03 May 2017 13:23:36 +0200 Pierre-Yves David merge with future 6.1.0 mercurial-3.9
Fri, 28 Apr 2017 16:57:41 +0200 Boris Feld ui: add better messages when the working copy become obsolete.
Tue, 14 Mar 2017 14:47:20 -0700 Pierre-Yves David mercurial-3.9: merge with hg-4.0 branch mercurial-3.9
Tue, 28 Feb 2017 15:09:03 +0100 Pierre-Yves David evolve: move the extensions to 'hgext3rd'
Sat, 29 Oct 2016 15:07:27 +0200 Pierre-Yves David merge with latest fix mercurial-3.4
Sat, 29 Oct 2016 15:04:23 +0200 Pierre-Yves David merge with latest fix mercurial-3.5
Sat, 29 Oct 2016 14:40:47 +0200 Pierre-Yves David merge with latest fix mercurial-3.9
Fri, 28 Oct 2016 17:15:57 -0700 Martin von Zweigbergk evolve: use single quotes in usage messages stable
Fri, 28 Oct 2016 17:11:43 -0700 Martin von Zweigbergk evolve: prefer "abort" over "abandon" in messages for consistency stable
Fri, 28 Oct 2016 15:04:40 -0700 Martin von Zweigbergk evolve: suggest "hg update -C .", including '.', to abort evolve stable
Fri, 28 Oct 2016 17:02:56 +0200 Pierre-Yves David merge with future 5.5 mercurial-3.4
Fri, 28 Oct 2016 16:59:32 +0200 Pierre-Yves David merge future 5.5 mercurial-3.5
Fri, 28 Oct 2016 16:03:00 +0200 Pierre-Yves David integrate code update and test change from future 5.5 code mercurial-3.9
Thu, 22 Sep 2016 09:15:30 -0700 Kostia Balytskyi evolve: fix test breaks related to double->single quote changes
Mon, 12 Sep 2016 10:41:00 -0700 Durham Goode bump: copy parent manifest before editting it stable
Fri, 06 May 2016 00:08:31 +0200 Pierre-Yves David merge with stable through 3.5 branch mercurial-3.4
Fri, 06 May 2016 00:00:14 +0200 Pierre-Yves David merge with stable throug 3.6 branch mercurial-3.5
Fri, 18 Mar 2016 16:37:49 -0700 Pierre-Yves David prune: remove the kill alias
Thu, 11 Feb 2016 00:32:40 +0000 Pierre-Yves David merge with new stable through 3.5 and 3.6 mercurial-3.4
Thu, 04 Feb 2016 11:07:44 +0000 Pierre-Yves David tests: register expected difference for Mercurial 3.5 mercurial-3.5
Thu, 04 Feb 2016 11:01:35 +0000 Pierre-Yves David tests: register expected difference for Mercurial 3.4 mercurial-3.4
Fri, 30 Oct 2015 15:48:13 +0000 Pierre-Yves David tests: run test with 3.6 and apply test change
Thu, 25 Jun 2015 17:38:40 -0700 Pierre-Yves David merge with stable
Thu, 25 Jun 2015 16:55:27 -0700 Pierre-Yves David merge with stable stable
Wed, 24 Jun 2015 16:37:02 -0700 Pierre-Yves David evolve: add a hint when the parent working copy become obsolete
Tue, 16 Jun 2015 15:14:37 -0700 Laurent Charignon evolve: add selector for trouble types
Fri, 19 Jun 2015 10:47:02 -0700 Pierre-Yves David merge with stable
Fri, 19 Jun 2015 10:44:25 -0700 Pierre-Yves David evolve: add a hint about how to abort an evolve with conflict stable
Thu, 18 Jun 2015 23:45:37 -0700 Pierre-Yves David merge with stable
Thu, 18 Jun 2015 18:05:57 -0700 Pierre-Yves David evolve: fix default value for --confirm stable
Thu, 18 Jun 2015 17:57:11 -0700 Pierre-Yves David merge with stable
Thu, 18 Jun 2015 15:56:56 -0700 Pierre-Yves David evolve: search divergence within all precursors stable
Mon, 01 Jun 2015 10:56:49 -0700 Pierre-Yves David tests: adapt summary output to 6084926366b9
Fri, 30 Jan 2015 19:01:23 +0000 Pierre-Yves David tests: update to new core output
Sun, 14 Dec 2014 12:19:40 -0800 Pierre-Yves David test: adapt to core change in graft and rebase
Fri, 29 Aug 2014 14:26:17 +0200 David Soria Parra evolve: write a status message when the working directory changes stable
Wed, 20 Aug 2014 20:49:48 -0700 Pierre-Yves David evolve: yield to relevant markers handling in core
Fri, 15 Aug 2014 17:07:55 -0700 Pierre-Yves David test: update test to new date formatting in debuobsolete output
Fri, 08 Aug 2014 23:02:26 -0700 Pierre-Yves David evolve: adds a --confirm option
Fri, 08 Aug 2014 15:55:04 -0700 Pierre-Yves David merge with stable
Fri, 08 Aug 2014 10:40:47 -0700 Pierre-Yves David test: apply message changes introduced by mercurial 3.1 stable
Tue, 29 Jul 2014 17:15:01 -0700 Pierre-Yves David test: adapt to upstream message change
Sat, 21 Jun 2014 18:31:21 -0400 Greg Ward tests: fix grammar, spelling, punctuation in comments
Mon, 02 Jun 2014 15:22:23 -0700 Pierre-Yves David test: update to output change introduced by future 3.1
Sat, 31 May 2014 00:23:25 -0700 Pierre-Yves David merge with stable
Tue, 29 Apr 2014 22:25:35 +0200 Angel Ezquerra evolve: improve wording of a few of messages stable
Sun, 25 May 2014 17:37:13 -0400 Greg Ward evolve: fix spelling error stable
Fri, 04 Apr 2014 00:58:15 +0200 Olle Lundberg evolve: deprecate gup and gdown aliases
Thu, 20 Feb 2014 13:32:04 -0800 Pierre-Yves David test: get rid of all reference to conflicting changesets
Fri, 15 Nov 2013 21:44:24 -0500 Pierre-Yves David grab: update the alias for 2.8 compatibility
Fri, 15 Nov 2013 19:14:19 -0500 Pierre-Yves David test: prepare test for core changeset 6cd9b8428104
Fri, 15 Nov 2013 18:53:29 -0500 Pierre-Yves David test: prepare test for core changeset 9c78ed396075
Fri, 26 Jul 2013 12:06:44 +0200 Dan Villiom Podlaski Christiansen conform to the Mercurial custom of lowercase messages
Wed, 16 Oct 2013 00:37:29 +0200 Pierre-Yves David amend: use core mechanism for amend
Mon, 03 Jun 2013 13:28:13 +0200 Pierre-Yves David Adapt to human readable date in patch
Sun, 10 Feb 2013 16:14:45 +0100 Levi Bard evolve: update test output.
Fri, 08 Feb 2013 21:43:00 +0000 Pierre-Yves David amend: prune replacement commit without sucessors stable
Fri, 08 Feb 2013 20:45:18 +0000 Pierre-Yves David alias: add a grab alias stable
Mon, 03 Dec 2012 00:10:58 +0100 Pierre-Yves David prepare for Full scale filtering !!!
Tue, 23 Oct 2012 17:32:22 +0200 Pierre-Yves David evolve: Rename latecomer into bumped stable
Tue, 23 Oct 2012 16:36:29 +0200 Pierre-Yves David evolve: smarter code for divergent changeset stable
Tue, 23 Oct 2012 15:44:24 +0200 Pierre-Yves David evolve: rename conflicting into divergent stable
Mon, 10 Sep 2012 17:33:06 +0200 Pierre-Yves David fix missing --dest evolve output in dryrun stable
Thu, 30 Aug 2012 13:54:43 +0200 Aurelien Campeas a better msg for this tricky situation stable
Thu, 30 Aug 2012 13:50:17 +0200 Pierre-Yves David test conflicting conflicting (sic) resolution stable
Sat, 25 Aug 2012 09:45:03 +0200 Patrick Mezard evolve: usual syntax/grammar errors/long lines cleanup stable
Fri, 24 Aug 2012 11:17:18 +0200 Pierre-Yves David rename `stabilize` to `evolve`
Fri, 24 Aug 2012 10:44:23 +0200 Pierre-Yves David merge evolve and obsolete
Thu, 23 Aug 2012 18:00:29 +0200 Pierre-Yves David fix typo
Thu, 23 Aug 2012 17:40:28 +0200 Pierre-Yves David evolve: stabilize now handle conflicting changeset
Thu, 23 Aug 2012 14:15:36 +0200 Pierre-Yves David stabilize: conflicting changeset are considered if "."
Tue, 21 Aug 2012 10:10:44 +0200 Pierre-Yves David stabilize: handle latecomer
Mon, 20 Aug 2012 14:13:29 +0200 Pierre-Yves David stabilize: --continue support !!!
Tue, 07 Aug 2012 18:26:13 +0200 Pierre-Yves David drop repo.addobsolete
Tue, 07 Aug 2012 16:02:50 +0200 Pierre-Yves David obsolete: remove debugsuccessors
Wed, 25 Jul 2012 19:23:43 +0200 Pierre-Yves David obsolete: Stop turning obsolete secret changesets secret
Sun, 08 Jul 2012 19:02:36 +0200 Patrick Mezard tests: update graphlog output after hg@2e13c1bd34dc
Sat, 23 Jun 2012 11:14:09 +0200 Patrick Mezard obsolete: make collapse create less markers
Tue, 19 Jun 2012 17:57:54 +0200 Patrick Mezard evolve: fix relocate() with removed revision
less more | (0) tip