evolve: revision graph

graph

less more | rev 3843: (0) -3000 -1000 -112 +112 +1000 +3000 tip

evolve: improve error messages when conflicts occur
Tue, 12 Jun 2018 19:00:12 +0530, by Pulkit Goyal
evolve: point to `hg help evolve.interrupted` while resolving content-div
Tue, 12 Jun 2018 04:01:19 +0530, by Pulkit Goyal
tests: add test about aborting content-divergence when multiple parents
Tue, 12 Jun 2018 03:29:13 +0530, by Pulkit Goyal
CHANGELOG: add an entry about the --update flag
Wed, 13 Jun 2018 15:47:19 +0530, by Pulkit Goyal
evolve: show unfinished information in `hg status -v` (issue5886)
Wed, 06 Jun 2018 04:29:05 +0530, by Pulkit Goyal
style: drop a (commented) debug print
Tue, 12 Jun 2018 13:58:14 +0200, by Denis Laxalde
tests: update tests output with changes in d0abd7949ea3 in core hg
Sun, 10 Jun 2018 20:58:55 +0530, by Pulkit Goyal
branching: merge with stable
Tue, 12 Jun 2018 10:40:57 +0200, by Pierre-Yves David
Added tag 8.0.1 for changeset 0887c30255a1 stable
Mon, 11 Jun 2018 23:31:44 +0530, by Pulkit Goyal
packaging: prepare for 8.0.1 release stable 8.0.1
Mon, 11 Jun 2018 23:30:24 +0530, by Pulkit Goyal
changelog: add a couple of missing entry stable
Mon, 11 Jun 2018 20:24:45 +0200, by Pierre-Yves David
evolve: strip the extra obsmarkers if any on `hg evolve --abort`
Mon, 11 Jun 2018 20:17:56 +0530, by Pulkit Goyal
evolve: store the obsmarkers to be deleted in evolvestate
Mon, 11 Jun 2018 20:13:36 +0530, by Pulkit Goyal
evolve: store obsmarkers to be deleted in evolvestate
Mon, 11 Jun 2018 15:52:11 +0530, by Pulkit Goyal
evolve: factor out logic to merge branches in separate function
Mon, 11 Jun 2018 15:38:43 +0530, by Pulkit Goyal
tests: add more test of --stop while resolving content-divergence
Mon, 11 Jun 2018 01:00:57 +0530, by Pulkit Goyal
evolve: strip the relocation commit on `hg evolve --stop`
Mon, 11 Jun 2018 00:47:28 +0530, by Pulkit Goyal
evolve: declare updated and pctx variables in stopevolve()
Mon, 11 Jun 2018 00:43:39 +0530, by Pulkit Goyal
evolve: store the old other divergent node after relocation in evolvestate
Sun, 10 Jun 2018 22:52:11 +0530, by Pulkit Goyal
evolve: factor out logic for --stop flag in separate function
Sun, 10 Jun 2018 22:42:57 +0530, by Pulkit Goyal
tests: add test for --stop flag when resolving multiparents content-div
Sun, 10 Jun 2018 22:38:08 +0530, by Pulkit Goyal
evolve: move logic to continue interrupted content-div resolution to new fn
Sun, 10 Jun 2018 20:35:48 +0530, by Pulkit Goyal
evolve: rename help topic evolve.interrupted-evolve to evolve.interrupted
Mon, 11 Jun 2018 01:12:12 +0530, by Pulkit Goyal
packaging: update tested-with statements in evolve and topic stable
Sat, 09 Jun 2018 00:15:27 +0530, by Pulkit Goyal
CHANGELOG: mention about 4.6.1 compatibility stable
Sat, 09 Jun 2018 00:12:08 +0530, by Pulkit Goyal
test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3
Fri, 08 Jun 2018 22:52:53 +0530, by Pulkit Goyal
test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Fri, 08 Jun 2018 22:52:52 +0530, by Pulkit Goyal
test-compat: merge stable into mercurial-4.5 mercurial-4.5
Fri, 08 Jun 2018 22:52:51 +0530, by Pulkit Goyal
utility: use ui.interactive() instead of checking config value stable
Tue, 22 May 2018 23:51:57 +0530, by Pulkit Goyal
CHANGELOG: add couple of entries about things fixed stable
Fri, 08 Jun 2018 19:48:53 +0530, by Pulkit Goyal
next-prev: always respect the --merge flag stable
Fri, 08 Jun 2018 17:36:28 +0530, by Pulkit Goyal
next-prev: add tests showing --merge not respected in some cases stable
Fri, 08 Jun 2018 18:32:48 +0530, by Pulkit Goyal
evolve: store the evolvestate if relocation results in conflicts
Thu, 07 Jun 2018 22:59:39 +0530, by Pulkit Goyal
tests: add more test of resolution of content-divergent changesets
Thu, 07 Jun 2018 22:45:54 +0530, by Pulkit Goyal
evolvestate: store info about relocation while resolving content-divergence
Thu, 07 Jun 2018 18:18:10 +0530, by Pulkit Goyal
evolve: factor out logic to merge content divergent csets in separate fn
Thu, 07 Jun 2018 18:13:54 +0530, by Pulkit Goyal
evolve: commit the transaction if conflicts occur while merging content-div
Thu, 07 Jun 2018 20:27:03 +0530, by Pulkit Goyal
tests: add tests for resolving content-divergence when different parents
Thu, 07 Jun 2018 15:54:32 +0530, by Pulkit Goyal
evolve: implement resolution of content-divergence when on differet parents
Fri, 01 Jun 2018 19:52:06 +0530, by Pulkit Goyal
tests: add tests for resolving content-divergence with parent change
Fri, 01 Jun 2018 19:57:19 +0530, by Pulkit Goyal
CHANGELOG: add an entry about fixing issue5877
Wed, 06 Jun 2018 03:49:17 +0530, by Pulkit Goyal
evolve: pop up editor if conflicts occur while merging commit messages
Wed, 06 Jun 2018 03:26:47 +0530, by Pulkit Goyal
evolve: merge commit messages while resolving content-divergence (issue5877)
Mon, 04 Jun 2018 01:28:02 +0530, by Pulkit Goyal
evolve: move if-else block under the right block
Wed, 06 Jun 2018 01:19:36 +0530, by Pulkit Goyal
tests: make sure we don't result in commit messages conflict
Tue, 05 Jun 2018 22:02:24 +0530, by Pulkit Goyal
tests: don't use mkcommit shell function in test-divergent.t
Tue, 05 Jun 2018 21:02:09 +0530, by Pulkit Goyal
evolve: remove duplicated documentation
Wed, 06 Jun 2018 14:35:36 +0200, by Pierre-Yves David
evolve: show `hg help evolve.interrupted-evolve` in error when conflicts
Wed, 06 Jun 2018 04:09:49 +0530, by Pulkit Goyal
evolve: add a help topic `Interrupted-Evolve`
Wed, 23 May 2018 01:11:59 +0530, by Pulkit Goyal
branching: merge with stable
Tue, 05 Jun 2018 03:37:15 +0200, by Pierre-Yves David
changelog: fix version number error stable
Tue, 05 Jun 2018 03:36:40 +0200, by Pierre-Yves David
evolve: return the new node formed only as the replacement
Thu, 24 May 2018 02:12:14 +0530, by Pulkit Goyal
tests: add more test of --abort flag for content-divergence resolution
Thu, 24 May 2018 17:04:20 +0530, by Pulkit Goyal
evolve: prompt user for branch selection while resolving content-divergence
Mon, 04 Jun 2018 04:03:02 +0530, by Pulkit Goyal
evolve: pass the base revision in _completecontentdivergent()
Tue, 05 Jun 2018 03:51:01 +0530, by Pulkit Goyal
evolve: store the base of content-divergents in evolvestate
Tue, 05 Jun 2018 03:49:49 +0530, by Pulkit Goyal
evolve: use cmdrewrite.amend() instead of creating a new commit
Tue, 05 Jun 2018 00:53:21 +0530, by Pulkit Goyal
corecompat: update the tests output to show phase update summary
Sun, 03 Jun 2018 01:59:41 +0530, by Pulkit Goyal
CHANGELOG: add an entry about issue 5808 being fixed stable
Sun, 03 Jun 2018 03:24:43 +0530, by Pulkit Goyal
next-prev: replace the error hint to mention about `--merge` flag stable
Sun, 03 Jun 2018 03:21:25 +0530, by Pulkit Goyal
tests: add tests for conflicts while respecting commands.update.check stable
Sun, 03 Jun 2018 03:13:47 +0530, by Pulkit Goyal
next: respect `commands.update.check` config option in `hg next` (issue5808) stable
Sun, 03 Jun 2018 02:37:13 +0530, by Pulkit Goyal
prev: respect `commands.update.check` config option in `hg prev` (issue5808) stable
Sun, 03 Jun 2018 02:36:24 +0530, by Pulkit Goyal
tests: add test demonstrating issue5808 stable
Sun, 03 Jun 2018 02:50:55 +0530, by Pulkit Goyal
next: bail out early in `hg next --evolve` if dirty wdir stable
Sun, 03 Jun 2018 02:26:19 +0530, by Pulkit Goyal
tests: add test of `hg next --evolve` with dirty working directory stable
Sun, 03 Jun 2018 02:24:28 +0530, by Pulkit Goyal
CHANGELOG: add an entry about fixing issue5897 stable
Sun, 03 Jun 2018 03:35:22 +0530, by Pulkit Goyal
evolve: fix `hg abort` when hg next --evolve leads to conflicts (issue5897) stable
Sun, 27 May 2018 02:32:58 +0530, by Pulkit Goyal
tests: add a test demonstrating issue5897 stable
Wed, 30 May 2018 00:34:35 +0530, by Pulkit Goyal
evolve: add an `--update` flag to `hg evolve` command
Thu, 24 May 2018 17:50:02 +0530, by Pulkit Goyal
tests: add tests for testing --abort while content-divergence resolution
Thu, 24 May 2018 02:02:11 +0530, by Pulkit Goyal
evolve: fix storage of replacements and temprevs node in evolvestate
Thu, 24 May 2018 00:58:50 +0530, by Pulkit Goyal
tests: add more tests related to aborting while resolving phase-divergence
Thu, 24 May 2018 00:58:35 +0530, by Pulkit Goyal
topic: suggest to clear a topic that becomes empty
Wed, 23 May 2018 12:16:24 +0200, by Denis Laxalde
topic: display a hint pointing at help when a topic becomes non-empty
Wed, 23 May 2018 11:37:37 +0200, by Denis Laxalde
branching: merge with compat fix on default
Thu, 24 May 2018 18:57:46 +0200, by Pierre-Yves David
evolve: add compat for repair.stripbmrevset which is moved to scmutil stable
Thu, 24 May 2018 01:50:26 +0530, by Pulkit Goyal
evolve: update the readme with more information about contribution stable
Wed, 23 May 2018 11:18:14 +0200, by Pierre-Yves David
topic: dedent items about publishing behavior in docstring stable
Wed, 23 May 2018 11:03:31 +0200, by Denis Laxalde
topic: use preformatted block for config snippets documentation stable
Wed, 23 May 2018 11:00:11 +0200, by Denis Laxalde
tests: add a test for "hg help -e topic" stable
Wed, 23 May 2018 11:09:37 +0200, by Denis Laxalde
branching: merge with stable
Wed, 23 May 2018 01:24:02 +0200, by Pierre-Yves David
content-div: add test showing `--stop` works during interrupted resolution
Tue, 22 May 2018 21:33:50 +0530, by Pulkit Goyal
evolve: create new commit while resolving content-divergence
Mon, 23 Apr 2018 14:48:53 +0530, by Pulkit Goyal
content-divergence: store the resolved revs in evolvestate['replacements']
Tue, 22 May 2018 20:33:42 +0530, by Pulkit Goyal
utility: use ui.interactive() instead of checking config value
Tue, 22 May 2018 23:51:57 +0530, by Pulkit Goyal
evolve: make `--abort` strip the temporary revs created during resolution
Wed, 23 May 2018 02:46:20 +0530, by Pulkit Goyal
evolve: store a list of temprevs in evolvestate
Wed, 23 May 2018 02:43:23 +0530, by Pulkit Goyal
evolve: check for None before adding in set of revisions to strip
Wed, 23 May 2018 02:36:14 +0530, by Pulkit Goyal
evolve: return the new replacement node to be stored in evolvestate
Wed, 23 May 2018 02:33:14 +0530, by Pulkit Goyal
evolve: don't make values of replacements dict lists
Wed, 23 May 2018 02:39:38 +0530, by Pulkit Goyal
tests: add a test file `--abort` flag while resolving phase-divergence
Wed, 23 May 2018 02:41:08 +0530, by Pulkit Goyal
evolve: pass revisions as strings to commands.*() stable
Tue, 15 May 2018 22:17:27 -0700, by Martin von Zweigbergk
tests: rename test-evolve-abort.t to test-evolve-abort-orphan.t
Wed, 23 May 2018 01:27:13 +0530, by Pulkit Goyal
branching: merge with branch for stable
Mon, 21 May 2018 16:56:52 +0200, by Pierre-Yves David
compat: update obshashrange test output
Mon, 21 May 2018 16:25:29 +0200, by Boris Feld
test: update to new outputs
Mon, 21 May 2018 14:56:51 +0200, by Boris Feld
compat: fix obslog with Mercurial 4.6+
Mon, 21 May 2018 13:07:49 +0200, by Boris Feld
debian: add line to clean-docs target to delete additional docs file stable
Sat, 19 May 2018 18:26:36 +0530, by Faheem Mitha
amend: use context manager for locks (issue5887) stable
Mon, 14 May 2018 15:25:38 -0700, by Martin von Zweigbergk
evolve: point to '--abort' in verbose status message stable
Thu, 10 May 2018 21:37:28 -0700, by Martin von Zweigbergk
evolvecmd: add comments and new lines in content-divergence handling logic
Sun, 22 Apr 2018 20:14:42 +0530, by Pulkit Goyal
evolve: show cset hash in "merging conetnt-divergent changeset"
Sun, 29 Apr 2018 19:18:54 +0530, by Pulkit Goyal
evolve: show cset hash in "update to local conflict" message
Sun, 29 Apr 2018 19:14:41 +0530, by Pulkit Goyal
evolve: use hg.updaterepo() instead of hg.update() to hide stats
Sun, 29 Apr 2018 19:11:29 +0530, by Pulkit Goyal
evolve: fix the conflicts error message during content-divergence resolution
Sun, 29 Apr 2018 19:04:18 +0530, by Pulkit Goyal
evolve: add logic to continue interrupted content-divergence resolution
Sun, 29 Apr 2018 18:51:56 +0530, by Pulkit Goyal
evolve: store the evolvestate file when encountering conflicts
Sun, 29 Apr 2018 18:48:36 +0530, by Pulkit Goyal
evolve: take out logic to complete phase-divergence in separate fn
Sun, 29 Apr 2018 18:13:29 +0530, by Pulkit Goyal
evolve: store divergent nodes in evolvestate when resolving content-divergence
Sun, 29 Apr 2018 17:54:01 +0530, by Pulkit Goyal
branching: merge stable into default
Wed, 02 May 2018 11:59:06 +0200, by Pierre-Yves David
tests: add test showing `hg evolve --stop` works fine with phase-divergence stable
Sat, 28 Apr 2018 18:44:07 +0530, by Pulkit Goyal

less more | rev 3843: (0) -3000 -1000 -112 +112 +1000 +3000 tip

Mercurial > evolve

graph